aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2007-12-22 12:52:52 -0500
committerDavid S. Miller <davem@davemloft.net>2008-01-28 18:07:58 -0500
commit904584018e9ba30a3e562d86ee7dfb6239105664 (patch)
tree4ca6856a732c4d8e98f0537ddf196a98e9058250
parenta3edb08311fc559652ffc959e93eb5be9294443f (diff)
annotate the rest of drivers/net/wan
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r--drivers/net/wan/hdlc_ppp.c2
-rw-r--r--drivers/net/wan/hdlc_raw_eth.c2
-rw-r--r--drivers/net/wan/lmc/lmc_proto.c2
-rw-r--r--drivers/net/wan/lmc/lmc_proto.h2
-rw-r--r--drivers/net/wan/sbni.c4
-rw-r--r--drivers/net/wan/wanxl.c2
-rw-r--r--include/linux/if_frad.h2
7 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 3caeb528eace..519e1550e2e7 100644
--- a/drivers/net/wan/hdlc_ppp.c
+++ b/drivers/net/wan/hdlc_ppp.c
@@ -42,7 +42,7 @@ static inline struct ppp_state* state(hdlc_device *hdlc)
42static int ppp_open(struct net_device *dev) 42static int ppp_open(struct net_device *dev)
43{ 43{
44 hdlc_device *hdlc = dev_to_hdlc(dev); 44 hdlc_device *hdlc = dev_to_hdlc(dev);
45 void *old_ioctl; 45 int (*old_ioctl)(struct net_device *, struct ifreq *, int);
46 int result; 46 int result;
47 47
48 dev->priv = &state(hdlc)->syncppp_ptr; 48 dev->priv = &state(hdlc)->syncppp_ptr;
diff --git a/drivers/net/wan/hdlc_raw_eth.c b/drivers/net/wan/hdlc_raw_eth.c
index 1a69a9aaa9b9..8895394e6006 100644
--- a/drivers/net/wan/hdlc_raw_eth.c
+++ b/drivers/net/wan/hdlc_raw_eth.c
@@ -59,7 +59,7 @@ static int raw_eth_ioctl(struct net_device *dev, struct ifreq *ifr)
59 raw_hdlc_proto new_settings; 59 raw_hdlc_proto new_settings;
60 hdlc_device *hdlc = dev_to_hdlc(dev); 60 hdlc_device *hdlc = dev_to_hdlc(dev);
61 int result; 61 int result;
62 void *old_ch_mtu; 62 int (*old_ch_mtu)(struct net_device *, int);
63 int old_qlen; 63 int old_qlen;
64 64
65 switch (ifr->ifr_settings.type) { 65 switch (ifr->ifr_settings.type) {
diff --git a/drivers/net/wan/lmc/lmc_proto.c b/drivers/net/wan/lmc/lmc_proto.c
index 426c0678d983..85315758198d 100644
--- a/drivers/net/wan/lmc/lmc_proto.c
+++ b/drivers/net/wan/lmc/lmc_proto.c
@@ -208,7 +208,7 @@ void lmc_proto_close(lmc_softc_t *sc) /*FOLD00*/
208 lmc_trace(sc->lmc_device, "lmc_proto_close out"); 208 lmc_trace(sc->lmc_device, "lmc_proto_close out");
209} 209}
210 210
211unsigned short lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/ 211__be16 lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb) /*FOLD00*/
212{ 212{
213 lmc_trace(sc->lmc_device, "lmc_proto_type in"); 213 lmc_trace(sc->lmc_device, "lmc_proto_type in");
214 switch(sc->if_type){ 214 switch(sc->if_type){
diff --git a/drivers/net/wan/lmc/lmc_proto.h b/drivers/net/wan/lmc/lmc_proto.h
index 080a55773349..ccaa69e8b3c7 100644
--- a/drivers/net/wan/lmc/lmc_proto.h
+++ b/drivers/net/wan/lmc/lmc_proto.h
@@ -8,7 +8,7 @@ void lmc_proto_reopen(lmc_softc_t *sc);
8int lmc_proto_ioctl(lmc_softc_t *sc, struct ifreq *ifr, int cmd); 8int lmc_proto_ioctl(lmc_softc_t *sc, struct ifreq *ifr, int cmd);
9void lmc_proto_open(lmc_softc_t *sc); 9void lmc_proto_open(lmc_softc_t *sc);
10void lmc_proto_close(lmc_softc_t *sc); 10void lmc_proto_close(lmc_softc_t *sc);
11unsigned short lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb); 11__be16 lmc_proto_type(lmc_softc_t *sc, struct sk_buff *skb);
12void lmc_proto_netif(lmc_softc_t *sc, struct sk_buff *skb); 12void lmc_proto_netif(lmc_softc_t *sc, struct sk_buff *skb);
13int lmc_skb_rawpackets(char *buf, char **start, off_t offset, int len, int unused); 13int lmc_skb_rawpackets(char *buf, char **start, off_t offset, int len, int unused);
14 14
diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c
index 2e8b5c2de887..15d5c58e57bc 100644
--- a/drivers/net/wan/sbni.c
+++ b/drivers/net/wan/sbni.c
@@ -391,8 +391,8 @@ sbni_probe1( struct net_device *dev, unsigned long ioaddr, int irq )
391 spin_lock_init( &nl->lock ); 391 spin_lock_init( &nl->lock );
392 392
393 /* store MAC address (generate if that isn't known) */ 393 /* store MAC address (generate if that isn't known) */
394 *(u16 *)dev->dev_addr = htons( 0x00ff ); 394 *(__be16 *)dev->dev_addr = htons( 0x00ff );
395 *(u32 *)(dev->dev_addr + 2) = htonl( 0x01000000 | 395 *(__be32 *)(dev->dev_addr + 2) = htonl( 0x01000000 |
396 ( (mac[num] ? mac[num] : (u32)((long)dev->priv)) & 0x00ffffff) ); 396 ( (mac[num] ? mac[num] : (u32)((long)dev->priv)) & 0x00ffffff) );
397 397
398 /* store link settings (speed, receive level ) */ 398 /* store link settings (speed, receive level ) */
diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c
index ad8c8651d298..d4aab8a28b61 100644
--- a/drivers/net/wan/wanxl.c
+++ b/drivers/net/wan/wanxl.c
@@ -715,7 +715,7 @@ static int __devinit wanxl_pci_init_one(struct pci_dev *pdev,
715 } 715 }
716 716
717 for (i = 0; i < sizeof(firmware); i += 4) 717 for (i = 0; i < sizeof(firmware); i += 4)
718 writel(htonl(*(u32*)(firmware + i)), mem + PDM_OFFSET + i); 718 writel(ntohl(*(__be32*)(firmware + i)), mem + PDM_OFFSET + i);
719 719
720 for (i = 0; i < ports; i++) 720 for (i = 0; i < ports; i++)
721 writel(card->status_address + 721 writel(card->status_address +
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h
index f272a80caa3e..5c34240de746 100644
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
@@ -137,7 +137,7 @@ struct frhdr
137 137
138 unsigned char NLPID; 138 unsigned char NLPID;
139 unsigned char OUI[3]; 139 unsigned char OUI[3];
140 unsigned short PID; 140 __be16 PID;
141 141
142#define IP_NLPID pad 142#define IP_NLPID pad
143} __attribute__((packed)); 143} __attribute__((packed));