svcrpc: treat uid's as unsigned

[safe/jmp/linux-2.6] / net / netrom / nr_dev.c

diff --git a/net/netrom/nr_dev.c b/net/netrom/nr_dev.c
index 621e558..7aa11b0 100644 (file)
--- a/net/netrom/nr_dev.c
+++ b/net/netrom/nr_dev.c
@@ -6,11 +6,9 @@
  *
  * Copyright Jonathan Naylor G4KLX (g4klx@g4klx.demon.co.uk)
  */
-#include <linux/config.h>
 #include <linux/module.h>
 #include <linux/proc_fs.h>
 #include <linux/kernel.h>
-#include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/fs.h>
 #include <linux/types.h>
@@ -44,7 +42,7 @@
 
 int nr_rx_ip(struct sk_buff *skb, struct net_device *dev)
 {
-       struct net_device_stats *stats = netdev_priv(dev);
+       struct net_device_stats *stats = &dev->stats;
 
        if (!netif_running(dev)) {
                stats->rx_dropped++;
@@ -58,8 +56,8 @@ int nr_rx_ip(struct sk_buff *skb, struct net_device *dev)
 
        /* Spoof incoming device */
        skb->dev      = dev;
-       skb->mac.raw  = skb->nh.raw;
-       skb->nh.raw   = skb->data;
+       skb->mac_header = skb->network_header;
+       skb_reset_network_header(skb);
        skb->pkt_type = PACKET_HOST;
 
        netif_rx(skb);
@@ -97,8 +95,9 @@ static int nr_rebuild_header(struct sk_buff *skb)
 
 #endif
 
-static int nr_header(struct sk_buff *skb, struct net_device *dev, unsigned short type,
-       void *daddr, void *saddr, unsigned len)
+static int nr_header(struct sk_buff *skb, struct net_device *dev,
+                    unsigned short type,
+                    const void *daddr, const void *saddr, unsigned len)
 {
        unsigned char *buff = skb_push(skb, NR_NETWORK_LEN + NR_TRANSPORT_LEN);
 
@@ -129,25 +128,37 @@ static int nr_header(struct sk_buff *skb, struct net_device *dev, unsigned short
        return -37;
 }
 
-static int nr_set_mac_address(struct net_device *dev, void *addr)
+static int __must_check nr_set_mac_address(struct net_device *dev, void *addr)
 {
        struct sockaddr *sa = addr;
+       int err;
+
+       if (!memcmp(dev->dev_addr, sa->sa_data, dev->addr_len))
+               return 0;
+
+       if (dev->flags & IFF_UP) {
+               err = ax25_listen_register((ax25_address *)sa->sa_data, NULL);
+               if (err)
+                       return err;
 
-       if (dev->flags & IFF_UP)
                ax25_listen_release((ax25_address *)dev->dev_addr, NULL);
+       }
 
        memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
 
-       if (dev->flags & IFF_UP)
-               ax25_listen_register((ax25_address *)dev->dev_addr, NULL);
-
        return 0;
 }
 
 static int nr_open(struct net_device *dev)
 {
+       int err;
+
+       err = ax25_listen_register((ax25_address *)dev->dev_addr, NULL);
+       if (err)
+               return err;
+
        netif_start_queue(dev);
-       ax25_listen_register((ax25_address *)dev->dev_addr, NULL);
+
        return 0;
 }
 
@@ -158,47 +169,44 @@ static int nr_close(struct net_device *dev)
        return 0;
 }
 
-static int nr_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t nr_xmit(struct sk_buff *skb, struct net_device *dev)
 {
-       struct nr_private *nr = netdev_priv(dev);
-       struct net_device_stats *stats = &nr->stats;
+       struct net_device_stats *stats = &dev->stats;
        unsigned int len = skb->len;
 
        if (!nr_route_frame(skb, NULL)) {
                kfree_skb(skb);
                stats->tx_errors++;
-               return 0;
+               return NETDEV_TX_OK;
        }
 
        stats->tx_packets++;
        stats->tx_bytes += len;
 
-       return 0;
+       return NETDEV_TX_OK;
 }
 
-static struct net_device_stats *nr_get_stats(struct net_device *dev)
-{
-       struct nr_private *nr = netdev_priv(dev);
+static const struct header_ops nr_header_ops = {
+       .create = nr_header,
+       .rebuild= nr_rebuild_header,
+};
 
-       return &nr->stats;
-}
+static const struct net_device_ops nr_netdev_ops = {
+       .ndo_open               = nr_open,
+       .ndo_stop               = nr_close,
+       .ndo_start_xmit         = nr_xmit,
+       .ndo_set_mac_address    = nr_set_mac_address,
+};
 
 void nr_setup(struct net_device *dev)
 {
        dev->mtu                = NR_MAX_PACKET_SIZE;
-       dev->hard_start_xmit    = nr_xmit;
-       dev->open               = nr_open;
-       dev->stop               = nr_close;
-
-       dev->hard_header        = nr_header;
+       dev->netdev_ops         = &nr_netdev_ops;
+       dev->header_ops         = &nr_header_ops;
        dev->hard_header_len    = NR_NETWORK_LEN + NR_TRANSPORT_LEN;
        dev->addr_len           = AX25_ADDR_LEN;
        dev->type               = ARPHRD_NETROM;
-       dev->rebuild_header     = nr_rebuild_header;
-       dev->set_mac_address    = nr_set_mac_address;
 
        /* New-style flags. */
        dev->flags              = IFF_NOARP;
-
-       dev->get_stats          = nr_get_stats;
 }