Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-2.6

[linux-2.6-omap-h63xx.git] / drivers / net / wan / cycx_x25.c

diff --git a/drivers/net/wan/cycx_x25.c b/drivers/net/wan/cycx_x25.c
index a8af28b273d3f162f2394698990891713b57cbab..d3b28b01b9f91c5e5e52cfb5eb9a60940cb07531 100644 (file)
--- a/drivers/net/wan/cycx_x25.c
+++ b/drivers/net/wan/cycx_x25.c
@@ -131,14 +131,15 @@ static int cycx_wan_update(struct wan_device *wandev),
           cycx_wan_del_if(struct wan_device *wandev, struct net_device *dev);
 
 /* Network device interface */
-static int cycx_netdevice_init(struct net_device *dev),
-          cycx_netdevice_open(struct net_device *dev),
-          cycx_netdevice_stop(struct net_device *dev),
-          cycx_netdevice_hard_header(struct sk_buff *skb,
-                                    struct net_device *dev, u16 type,
-                                    void *daddr, void *saddr, unsigned len),
-          cycx_netdevice_rebuild_header(struct sk_buff *skb),
-          cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
+static int cycx_netdevice_init(struct net_device *dev);
+static int cycx_netdevice_open(struct net_device *dev);
+static int cycx_netdevice_stop(struct net_device *dev);
+static int cycx_netdevice_hard_header(struct sk_buff *skb,
+                                     struct net_device *dev, u16 type,
+                                     const void *daddr, const void *saddr,
+                                     unsigned len);
+static int cycx_netdevice_rebuild_header(struct sk_buff *skb);
+static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
                                          struct net_device *dev);
 
 static struct net_device_stats *
@@ -468,7 +469,14 @@ static int cycx_wan_del_if(struct wan_device *wandev, struct net_device *dev)
        return 0;
 }
 
+
 /* Network Device Interface */
+
+static const struct header_ops cycx_header_ops = {
+       .create = cycx_netdevice_hard_header,
+       .rebuild = cycx_netdevice_rebuild_header,
+};
+
 /* Initialize Linux network interface.
  *
  * This routine is called only once for each interface, during Linux network
@@ -483,8 +491,8 @@ static int cycx_netdevice_init(struct net_device *dev)
        /* Initialize device driver entry points */
        dev->open               = cycx_netdevice_open;
        dev->stop               = cycx_netdevice_stop;
-       dev->hard_header        = cycx_netdevice_hard_header;
-       dev->rebuild_header     = cycx_netdevice_rebuild_header;
+       dev->header_ops         = &cycx_header_ops;
+
        dev->hard_start_xmit    = cycx_netdevice_hard_start_xmit;
        dev->get_stats          = cycx_netdevice_get_stats;
 
@@ -495,7 +503,7 @@ static int cycx_netdevice_init(struct net_device *dev)
        dev->addr_len           = 0;            /* hardware address length */
 
        if (!chan->svc)
-               *(u16*)dev->dev_addr = htons(chan->lcn);
+               *(__be16*)dev->dev_addr = htons(chan->lcn);
 
        /* Initialize hardware parameters (just for reference) */
        dev->irq                = wandev->irq;
@@ -508,7 +516,6 @@ static int cycx_netdevice_init(struct net_device *dev)
 
        /* Set transmit buffer queue length */
        dev->tx_queue_len       = 10;
-       SET_MODULE_OWNER(dev);
 
        /* Initialize socket buffers */
        cycx_x25_set_chan_state(dev, WAN_DISCONNECTED);
@@ -555,9 +562,10 @@ static int cycx_netdevice_stop(struct net_device *dev)
  * Return:     media header length. */
 static int cycx_netdevice_hard_header(struct sk_buff *skb,
                                      struct net_device *dev, u16 type,
-                                     void *daddr, void *saddr, unsigned len)
+                                     const void *daddr, const void *saddr,
+                                     unsigned len)
 {
-       skb->protocol = type;
+       skb->protocol = htons(type);
 
        return dev->hard_header_len;
 }
@@ -592,15 +600,15 @@ static int cycx_netdevice_hard_start_xmit(struct sk_buff *skb,
        struct cycx_device *card = chan->card;
 
        if (!chan->svc)
-               chan->protocol = skb->protocol;
+               chan->protocol = ntohs(skb->protocol);
 
        if (card->wandev.state != WAN_CONNECTED)
                ++chan->ifstats.tx_dropped;
        else if (chan->svc && chan->protocol &&
-                chan->protocol != skb->protocol) {
+                chan->protocol != ntohs(skb->protocol)) {
                printk(KERN_INFO
                       "%s: unsupported Ethertype 0x%04X on interface %s!\n",
-                      card->devname, skb->protocol, dev->name);
+                      card->devname, ntohs(skb->protocol), dev->name);
                ++chan->ifstats.tx_errors;
        } else if (chan->protocol == ETH_P_IP) {
                switch (chan->state) {
@@ -1393,7 +1401,7 @@ static void cycx_x25_set_chan_state(struct net_device *dev, u8 state)
                switch (state) {
                case WAN_CONNECTED:
                        string_state = "connected!";
-                       *(u16*)dev->dev_addr = htons(chan->lcn);
+                       *(__be16*)dev->dev_addr = htons(chan->lcn);
                        netif_wake_queue(dev);
                        reset_timer(dev);