tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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>

authored by

Al Viro and committed by
David S. Miller 90458401 a3edb083

+8 -8
+1 -1
drivers/net/wan/hdlc_ppp.c
··· 42 42 static int ppp_open(struct net_device *dev) 43 43 { 44 44 hdlc_device *hdlc = dev_to_hdlc(dev); 45 - void *old_ioctl; 45 + int (*old_ioctl)(struct net_device *, struct ifreq *, int); 46 46 int result; 47 47 48 48 dev->priv = &state(hdlc)->syncppp_ptr;
+1 -1
drivers/net/wan/hdlc_raw_eth.c
··· 59 59 raw_hdlc_proto new_settings; 60 60 hdlc_device *hdlc = dev_to_hdlc(dev); 61 61 int result; 62 - void *old_ch_mtu; 62 + int (*old_ch_mtu)(struct net_device *, int); 63 63 int old_qlen; 64 64 65 65 switch (ifr->ifr_settings.type) {
+1 -1
drivers/net/wan/lmc/lmc_proto.c
··· 208 208 lmc_trace(sc->lmc_device, "lmc_proto_close out"); 209 209 } 210 210 211 - unsigned 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 213 lmc_trace(sc->lmc_device, "lmc_proto_type in"); 214 214 switch(sc->if_type){
+1 -1
drivers/net/wan/lmc/lmc_proto.h
··· 8 8 int lmc_proto_ioctl(lmc_softc_t *sc, struct ifreq *ifr, int cmd); 9 9 void lmc_proto_open(lmc_softc_t *sc); 10 10 void lmc_proto_close(lmc_softc_t *sc); 11 - unsigned 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); 12 12 void lmc_proto_netif(lmc_softc_t *sc, struct sk_buff *skb); 13 13 int lmc_skb_rawpackets(char *buf, char **start, off_t offset, int len, int unused); 14 14
+2 -2
drivers/net/wan/sbni.c
··· 391 391 spin_lock_init( &nl->lock ); 392 392 393 393 /* store MAC address (generate if that isn't known) */ 394 - *(u16 *)dev->dev_addr = htons( 0x00ff ); 395 - *(u32 *)(dev->dev_addr + 2) = htonl( 0x01000000 | 394 + *(__be16 *)dev->dev_addr = htons( 0x00ff ); 395 + *(__be32 *)(dev->dev_addr + 2) = htonl( 0x01000000 | 396 396 ( (mac[num] ? mac[num] : (u32)((long)dev->priv)) & 0x00ffffff) ); 397 397 398 398 /* store link settings (speed, receive level ) */
+1 -1
drivers/net/wan/wanxl.c
··· 715 715 } 716 716 717 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 720 for (i = 0; i < ports; i++) 721 721 writel(card->status_address +
+1 -1
include/linux/if_frad.h
··· 137 137 138 138 unsigned char NLPID; 139 139 unsigned char OUI[3]; 140 - unsigned short PID; 140 + __be16 PID; 141 141 142 142 #define IP_NLPID pad 143 143 } __attribute__((packed));