Commit 90458401 authored by Al Viro's avatar Al Viro Committed by David S. Miller

annotate the rest of drivers/net/wan

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent a3edb083
...@@ -42,7 +42,7 @@ static inline struct ppp_state* state(hdlc_device *hdlc) ...@@ -42,7 +42,7 @@ static inline struct ppp_state* state(hdlc_device *hdlc)
static int ppp_open(struct net_device *dev) static int ppp_open(struct net_device *dev)
{ {
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
void *old_ioctl; int (*old_ioctl)(struct net_device *, struct ifreq *, int);
int result; int result;
dev->priv = &state(hdlc)->syncppp_ptr; dev->priv = &state(hdlc)->syncppp_ptr;
......
...@@ -59,7 +59,7 @@ static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr) ...@@ -59,7 +59,7 @@ static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr)
raw_hdlc_proto new_settings; raw_hdlc_proto new_settings;
hdlc_device *hdlc = dev_to_hdlc(dev); hdlc_device *hdlc = dev_to_hdlc(dev);
int result; int result;
void *old_ch_mtu; int (*old_ch_mtu)(struct net_device *, int);
int old_qlen; int old_qlen;
switch (ifr->ifr_settings.type) { switch (ifr->ifr_settings.type) {
......
...@@ -208,7 +208,7 @@ void lmc_proto_close(lmc_softc_t *sc) /*FOLD00*/ ...@@ -208,7 +208,7 @@ void lmc_proto_close(lmc_softc_t *sc) /*FOLD00*/
lmc_trace(sc->lmc_device, "lmc_proto_close out"); lmc_trace(sc->lmc_device, "lmc_proto_close out");
} }
unsigned short lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/ __be16 lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/
{ {
lmc_trace(sc->lmc_device, "lmc_proto_type in"); lmc_trace(sc->lmc_device, "lmc_proto_type in");
switch(sc->if_type){ switch(sc->if_type){
......
...@@ -8,7 +8,7 @@ void lmc_proto_reopen(lmc_softc_t *sc); ...@@ -8,7 +8,7 @@ void lmc_proto_reopen(lmc_softc_t *sc);
int lmc_proto_ioctl(lmc_softc_t *sc, struct ifreq *ifr, int cmd); int lmc_proto_ioctl(lmc_softc_t *sc, struct ifreq *ifr, int cmd);
void lmc_proto_open(lmc_softc_t *sc); void lmc_proto_open(lmc_softc_t *sc);
void lmc_proto_close(lmc_softc_t *sc); void lmc_proto_close(lmc_softc_t *sc);
unsigned short lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb); __be16 lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb);
void lmc_proto_netif(lmc_softc_t *sc, struct sk_buff *skb); void lmc_proto_netif(lmc_softc_t *sc, struct sk_buff *skb);
int lmc_skb_rawpackets(char *buf, char **start, off_t offset, int len, int unused); int lmc_skb_rawpackets(char *buf, char **start, off_t offset, int len, int unused);
......
...@@ -391,8 +391,8 @@ sbni_probe1( struct net_device *dev, unsigned long ioaddr, int irq ) ...@@ -391,8 +391,8 @@ sbni_probe1( struct net_device *dev, unsigned long ioaddr, int irq )
spin_lock_init( &nl->lock ); spin_lock_init( &nl->lock );
/* store MAC address (generate if that isn't known) */ /* store MAC address (generate if that isn't known) */
*(u16 *)dev->dev_addr = htons( 0x00ff ); *(__be16 *)dev->dev_addr = htons( 0x00ff );
*(u32 *)(dev->dev_addr + 2) = htonl( 0x01000000 | *(__be32 *)(dev->dev_addr + 2) = htonl( 0x01000000 |
( (mac[num] ? mac[num] : (u32)((long)dev->priv)) & 0x00ffffff) ); ( (mac[num] ? mac[num] : (u32)((long)dev->priv)) & 0x00ffffff) );
/* store link settings (speed, receive level ) */ /* store link settings (speed, receive level ) */
......
...@@ -715,7 +715,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev, ...@@ -715,7 +715,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
} }
for (i = 0; i < sizeof(firmware); i += 4) for (i = 0; i < sizeof(firmware); i += 4)
writel(htonl(*(u32*)(firmware + i)), mem + PDM_OFFSET + i); writel(ntohl(*(__be32*)(firmware + i)), mem + PDM_OFFSET + i);
for (i = 0; i < ports; i++) for (i = 0; i < ports; i++)
writel(card->status_address + writel(card->status_address +
......
...@@ -137,7 +137,7 @@ struct frhdr ...@@ -137,7 +137,7 @@ struct frhdr
unsigned char NLPID; unsigned char NLPID;
unsigned char OUI[3]; unsigned char OUI[3];
unsigned short PID; __be16 PID;
#define IP_NLPID pad #define IP_NLPID pad
} __attribute__((packed)); } __attribute__((packed));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment