diff options
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/wan/hdlc_ppp.c | 2 | ||||
| -rw-r--r-- | drivers/net/wan/hdlc_raw_eth.c | 2 | ||||
| -rw-r--r-- | drivers/net/wan/lmc/lmc_proto.c | 2 | ||||
| -rw-r--r-- | drivers/net/wan/lmc/lmc_proto.h | 2 | ||||
| -rw-r--r-- | drivers/net/wan/sbni.c | 4 | ||||
| -rw-r--r-- | drivers/net/wan/wanxl.c | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c index 3caeb528eac..519e1550e2e 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) static int ppp_open(struct net_device *dev) { hdlc_device *hdlc = dev_to_hdlc(dev); - void *old_ioctl; + int (*old_ioctl)(struct net_device *, struct ifreq *, int); int result; 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 1a69a9aaa9b..8895394e600 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) raw_hdlc_proto new_settings; hdlc_device *hdlc = dev_to_hdlc(dev); int result; - void *old_ch_mtu; + int (*old_ch_mtu)(struct net_device *, int); int old_qlen; switch (ifr->ifr_settings.type) { diff --git a/drivers/net/wan/lmc/lmc_proto.c b/drivers/net/wan/lmc/lmc_proto.c index 426c0678d98..85315758198 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*/ 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"); switch(sc->if_type){ diff --git a/drivers/net/wan/lmc/lmc_proto.h b/drivers/net/wan/lmc/lmc_proto.h index 080a5577334..ccaa69e8b3c 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); int lmc_proto_ioctl(lmc_softc_t *sc, struct ifreq *ifr, int cmd); void lmc_proto_open(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); int lmc_skb_rawpackets(char *buf, char **start, off_t offset, int len, int unused); diff --git a/drivers/net/wan/sbni.c b/drivers/net/wan/sbni.c index 2e8b5c2de88..15d5c58e57b 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 ) spin_lock_init( &nl->lock ); /* store MAC address (generate if that isn't known) */ - *(u16 *)dev->dev_addr = htons( 0x00ff ); - *(u32 *)(dev->dev_addr + 2) = htonl( 0x01000000 | + *(__be16 *)dev->dev_addr = htons( 0x00ff ); + *(__be32 *)(dev->dev_addr + 2) = htonl( 0x01000000 | ( (mac[num] ? mac[num] : (u32)((long)dev->priv)) & 0x00ffffff) ); /* store link settings (speed, receive level ) */ diff --git a/drivers/net/wan/wanxl.c b/drivers/net/wan/wanxl.c index ad8c8651d29..d4aab8a28b6 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, } 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++) writel(card->status_address + |