Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=904584018e9ba30a3e562d86ee7dfb6239105664
Commit:     904584018e9ba30a3e562d86ee7dfb6239105664
Parent:     a3edb08311fc559652ffc959e93eb5be9294443f
Author:     Al Viro <[EMAIL PROTECTED]>
AuthorDate: Sat Dec 22 17:52:52 2007 +0000
Committer:  David S. Miller <[EMAIL PROTECTED]>
CommitDate: Mon Jan 28 15:07:58 2008 -0800

    annotate the rest of drivers/net/wan
    
    Signed-off-by: Al Viro <[EMAIL PROTECTED]>
    Signed-off-by: Jeff Garzik <[EMAIL PROTECTED]>
---
 drivers/net/wan/hdlc_ppp.c      |    2 +-
 drivers/net/wan/hdlc_raw_eth.c  |    2 +-
 drivers/net/wan/lmc/lmc_proto.c |    2 +-
 drivers/net/wan/lmc/lmc_proto.h |    2 +-
 drivers/net/wan/sbni.c          |    4 ++--
 drivers/net/wan/wanxl.c         |    2 +-
 include/linux/if_frad.h         |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/drivers/net/wan/hdlc_ppp.c b/drivers/net/wan/hdlc_ppp.c
index 3caeb52..519e155 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 1a69a9a..8895394 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 426c067..8531575 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 080a557..ccaa69e 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 2e8b5c2..15d5c58 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 ad8c865..d4aab8a 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 +
diff --git a/include/linux/if_frad.h b/include/linux/if_frad.h
index f272a80..5c34240 100644
--- a/include/linux/if_frad.h
+++ b/include/linux/if_frad.h
@@ -137,7 +137,7 @@ struct frhdr
 
    unsigned char  NLPID;
    unsigned char  OUI[3];
-   unsigned short PID;
+   __be16 PID;
 
 #define IP_NLPID pad 
 } __attribute__((packed));
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to