Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville...

diff --git a/drivers/net/bna/bnad.c b/drivers/net/bna/bnad.c
index cbc1d563a0c269caa49198dff14dbce1192f50b8..79c4c24414499047ecd4c70e30473550f234e75c 100644 (file)
--- a/drivers/net/bna/bnad.c
+++ b/drivers/net/bna/bnad.c
@@ -1964,25 +1964,24 @@ bnad_enable_default_bcast(struct bnad *bnad)
 
 /* Statistics utilities */
 void
-bnad_netdev_qstats_fill(struct bnad *bnad)
+bnad_netdev_qstats_fill(struct bnad *bnad, struct rtnl_link_stats64 *stats)
 {
-       struct net_device_stats *net_stats = &bnad->net_stats;
        int i, j;
 
        for (i = 0; i < bnad->num_rx; i++) {
                for (j = 0; j < bnad->num_rxp_per_rx; j++) {
                        if (bnad->rx_info[i].rx_ctrl[j].ccb) {
-                               net_stats->rx_packets += bnad->rx_info[i].
+                               stats->rx_packets += bnad->rx_info[i].
                                rx_ctrl[j].ccb->rcb[0]->rxq->rx_packets;
-                               net_stats->rx_bytes += bnad->rx_info[i].
+                               stats->rx_bytes += bnad->rx_info[i].
                                        rx_ctrl[j].ccb->rcb[0]->rxq->rx_bytes;
                                if (bnad->rx_info[i].rx_ctrl[j].ccb->rcb[1] &&
                                        bnad->rx_info[i].rx_ctrl[j].ccb->
                                        rcb[1]->rxq) {
-                                       net_stats->rx_packets +=
+                                       stats->rx_packets +=
                                                bnad->rx_info[i].rx_ctrl[j].
                                                ccb->rcb[1]->rxq->rx_packets;
-                                       net_stats->rx_bytes +=
+                                       stats->rx_bytes +=
                                                bnad->rx_info[i].rx_ctrl[j].
                                                ccb->rcb[1]->rxq->rx_bytes;
                                }
@@ -1992,9 +1991,9 @@ bnad_netdev_qstats_fill(struct bnad *bnad)
        for (i = 0; i < bnad->num_tx; i++) {
                for (j = 0; j < bnad->num_txq_per_tx; j++) {
                        if (bnad->tx_info[i].tcb[j]) {
-                               net_stats->tx_packets +=
+                               stats->tx_packets +=
                                bnad->tx_info[i].tcb[j]->txq->tx_packets;
-                               net_stats->tx_bytes +=
+                               stats->tx_bytes +=
                                        bnad->tx_info[i].tcb[j]->txq->tx_bytes;
                        }
                }
@@ -2005,37 +2004,36 @@ bnad_netdev_qstats_fill(struct bnad *bnad)
  * Must be called with the bna_lock held.
  */
 void
-bnad_netdev_hwstats_fill(struct bnad *bnad)
+bnad_netdev_hwstats_fill(struct bnad *bnad, struct rtnl_link_stats64 *stats)
 {
        struct bfi_ll_stats_mac *mac_stats;
-       struct net_device_stats *net_stats = &bnad->net_stats;
        u64 bmap;
        int i;
 
        mac_stats = &bnad->stats.bna_stats->hw_stats->mac_stats;
-       net_stats->rx_errors =
+       stats->rx_errors =
                mac_stats->rx_fcs_error + mac_stats->rx_alignment_error +
                mac_stats->rx_frame_length_error + mac_stats->rx_code_error +
                mac_stats->rx_undersize;
-       net_stats->tx_errors = mac_stats->tx_fcs_error +
+       stats->tx_errors = mac_stats->tx_fcs_error +
                                        mac_stats->tx_undersize;
-       net_stats->rx_dropped = mac_stats->rx_drop;
-       net_stats->tx_dropped = mac_stats->tx_drop;
-       net_stats->multicast = mac_stats->rx_multicast;
-       net_stats->collisions = mac_stats->tx_total_collision;
+       stats->rx_dropped = mac_stats->rx_drop;
+       stats->tx_dropped = mac_stats->tx_drop;
+       stats->multicast = mac_stats->rx_multicast;
+       stats->collisions = mac_stats->tx_total_collision;
 
-       net_stats->rx_length_errors = mac_stats->rx_frame_length_error;
+       stats->rx_length_errors = mac_stats->rx_frame_length_error;
 
        /* receive ring buffer overflow  ?? */
 
-       net_stats->rx_crc_errors = mac_stats->rx_fcs_error;
-       net_stats->rx_frame_errors = mac_stats->rx_alignment_error;
+       stats->rx_crc_errors = mac_stats->rx_fcs_error;
+       stats->rx_frame_errors = mac_stats->rx_alignment_error;
        /* recv'r fifo overrun */
        bmap = (u64)bnad->stats.bna_stats->rxf_bmap[0] |
                ((u64)bnad->stats.bna_stats->rxf_bmap[1] << 32);
        for (i = 0; bmap && (i < BFI_LL_RXF_ID_MAX); i++) {
                if (bmap & 1) {
-                       net_stats->rx_fifo_errors =
+                       stats->rx_fifo_errors +=
                                bnad->stats.bna_stats->
                                        hw_stats->rxf_stats[i].frame_drops;
                        break;
@@ -2638,22 +2636,20 @@ bnad_start_xmit(struct sk_buff *skb, struct net_device *netdev)
  * Used spin_lock to synchronize reading of stats structures, which
  * is written by BNA under the same lock.
  */
-static struct net_device_stats *
-bnad_get_netdev_stats(struct net_device *netdev)
+static struct rtnl_link_stats64 *
+bnad_get_stats64(struct net_device *netdev, struct rtnl_link_stats64 *stats)
 {
        struct bnad *bnad = netdev_priv(netdev);
        unsigned long flags;
 
        spin_lock_irqsave(&bnad->bna_lock, flags);
 
-       memset(&bnad->net_stats, 0, sizeof(struct net_device_stats));
-
-       bnad_netdev_qstats_fill(bnad);
-       bnad_netdev_hwstats_fill(bnad);
+       bnad_netdev_qstats_fill(bnad, stats);
+       bnad_netdev_hwstats_fill(bnad, stats);
 
        spin_unlock_irqrestore(&bnad->bna_lock, flags);
 
-       return &bnad->net_stats;
+       return stats;
 }
 
 static void
@@ -2858,7 +2854,7 @@ static const struct net_device_ops bnad_netdev_ops = {
        .ndo_open               = bnad_open,
        .ndo_stop               = bnad_stop,
        .ndo_start_xmit         = bnad_start_xmit,
-       .ndo_get_stats          = bnad_get_netdev_stats,
+       .ndo_get_stats64                = bnad_get_stats64,
        .ndo_set_rx_mode        = bnad_set_rx_mode,
        .ndo_set_multicast_list = bnad_set_rx_mode,
        .ndo_validate_addr      = eth_validate_addr,

diff --git a/drivers/net/bna/bnad.h b/drivers/net/bna/bnad.h
index 3261401e35cbcade74d998624476213c570c0fd3..ee377888b905739e19ac84fd4480df9cb17d7bb0 100644 (file)
--- a/drivers/net/bna/bnad.h
+++ b/drivers/net/bna/bnad.h
@@ -273,7 +273,6 @@ struct bnad {
 
        /* Statistics */
        struct bnad_stats stats;
-       struct net_device_stats net_stats;
 
        struct bnad_diag *diag;
 
@@ -308,8 +307,8 @@ extern void bnad_cleanup_rx(struct bnad *bnad, uint rx_id);
 extern void bnad_dim_timer_start(struct bnad *bnad);
 
 /* Statistics */
-extern void bnad_netdev_qstats_fill(struct bnad *bnad);
-extern void bnad_netdev_hwstats_fill(struct bnad *bnad);
+extern void bnad_netdev_qstats_fill(struct bnad *bnad, struct rtnl_link_stats64 *stats);
+extern void bnad_netdev_hwstats_fill(struct bnad *bnad, struct rtnl_link_stats64 *stats);
 
 /**
  * MACROS

diff --git a/drivers/net/bna/bnad_ethtool.c b/drivers/net/bna/bnad_ethtool.c
index b337bd9bed2910a37ad54c913eef178b167a55a1..11fa2ea842c1258c855e666ab1e5244b330c60c8 100644 (file)
--- a/drivers/net/bna/bnad_ethtool.c
+++ b/drivers/net/bna/bnad_ethtool.c
@@ -34,7 +34,7 @@
 #define BNAD_NUM_TXQ_COUNTERS 5
 
 #define BNAD_ETHTOOL_STATS_NUM                                         \
-       (sizeof(struct net_device_stats) / sizeof(unsigned long) +      \
+       (sizeof(struct rtnl_link_stats64) / sizeof(u64) +       \
        sizeof(struct bnad_drv_stats) / sizeof(u64) +           \
        offsetof(struct bfi_ll_stats, rxf_stats[0]) / sizeof(u64))
 
@@ -1159,7 +1159,8 @@ bnad_get_ethtool_stats(struct net_device *netdev, struct ethtool_stats *stats,
 {
        struct bnad *bnad = netdev_priv(netdev);
        int i, j, bi;
-       unsigned long *net_stats, flags;
+       unsigned long flags;
+       struct rtnl_link_stats64 *net_stats64;
        u64 *stats64;
        u64 bmap;
 
@@ -1176,16 +1177,12 @@ bnad_get_ethtool_stats(struct net_device *netdev, struct ethtool_stats *stats,
        spin_lock_irqsave(&bnad->bna_lock, flags);
        bi = 0;
        memset(buf, 0, stats->n_stats * sizeof(u64));
-       memset(&bnad->net_stats, 0, sizeof(struct net_device_stats));
 
-       bnad_netdev_qstats_fill(bnad);
-       bnad_netdev_hwstats_fill(bnad);
+       net_stats64 = (struct rtnl_link_stats64 *)buf;
+       bnad_netdev_qstats_fill(bnad, net_stats64);
+       bnad_netdev_hwstats_fill(bnad, net_stats64);
 
-       /* Fill net_stats into ethtool buffers */
-       net_stats = (unsigned long *)&bnad->net_stats;
-       for (i = 0; i < sizeof(struct net_device_stats) / sizeof(unsigned long);
-            i++)
-               buf[bi++] = net_stats[i];
+       bi = sizeof(*net_stats64) / sizeof(u64);
 
        /* Fill driver stats into ethtool buffers */
        stats64 = (u64 *)&bnad->stats.drv_stats;

diff --git a/drivers/net/cxgb4vf/sge.c b/drivers/net/cxgb4vf/sge.c
index eb5a1c9cb2d3b588a309ea9cefc326ef1ee71b81..e00fd9c36e8b6dd608de62f2ed8cc5bbce0dc02d 100644 (file)
--- a/drivers/net/cxgb4vf/sge.c
+++ b/drivers/net/cxgb4vf/sge.c
@@ -1520,7 +1520,6 @@ int t4vf_ethrx_handler(struct sge_rspq *rspq, const __be64 *rsp,
        __skb_pull(skb, PKTSHIFT);
        skb->protocol = eth_type_trans(skb, rspq->netdev);
        skb_record_rx_queue(skb, rspq->idx);
-       skb->dev->last_rx = jiffies;                  /* XXX removed 2.6.29 */
        pi = netdev_priv(skb->dev);
        rxq->stats.pkts++;
 

diff --git a/drivers/net/pxa168_eth.c b/drivers/net/pxa168_eth.c
index 659915cf6872d42cc6f8ac675297bc6a99287680..764aa90994684e877d52e3a9892a3bbf3d280850 100644 (file)
--- a/drivers/net/pxa168_eth.c
+++ b/drivers/net/pxa168_eth.c
@@ -848,7 +848,6 @@ static int rxq_process(struct net_device *dev, int budget)
                        skb->protocol = eth_type_trans(skb, dev);
                        netif_receive_skb(skb);
                }
-               dev->last_rx = jiffies;
        }
        /* Fill RX ring with skb's */
        rxq_refill(dev);

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 6b0a782c6224f60d4530139a90ebc479ac6b3513..a6e047a04f798ed1ae0f75583ad7a2430b2c3958 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -116,7 +116,7 @@ struct mii_bus {
        /* list of all PHYs on bus */
        struct phy_device *phy_map[PHY_MAX_ADDR];
 
-       /* Phy addresses to be ignored when probing */
+       /* PHY addresses to be ignored when probing */
        u32 phy_mask;
 
        /*
@@ -283,7 +283,7 @@ struct phy_device {
 
        phy_interface_t interface;
 
-       /* Bus address of the PHY (0-32) */
+       /* Bus address of the PHY (0-31) */
        int addr;
 
        /*

diff --git a/net/core/dev.c b/net/core/dev.c
index d8c43e73f0b7b44db6e0d407f6c906aca727c005..efd318db11ab3732b37defcbbb9d84266e2c0732 100644 (file)
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -371,6 +371,14 @@ static inline void netdev_set_addr_lockdep_class(struct net_device *dev)
  *                                                     --ANK (980803)
  */
 
+static inline struct list_head *ptype_head(const struct packet_type *pt)
+{
+       if (pt->type == htons(ETH_P_ALL))
+               return &ptype_all;
+       else
+               return &ptype_base[ntohs(pt->type) & PTYPE_HASH_MASK];
+}
+
 /**
  *     dev_add_pack - add packet handler
  *     @pt: packet type declaration
@@ -386,16 +394,11 @@ static inline void netdev_set_addr_lockdep_class(struct net_device *dev)
 
 void dev_add_pack(struct packet_type *pt)
 {
-       int hash;
+       struct list_head *head = ptype_head(pt);
 
-       spin_lock_bh(&ptype_lock);
-       if (pt->type == htons(ETH_P_ALL))
-               list_add_rcu(&pt->list, &ptype_all);
-       else {
-               hash = ntohs(pt->type) & PTYPE_HASH_MASK;
-               list_add_rcu(&pt->list, &ptype_base[hash]);
-       }
-       spin_unlock_bh(&ptype_lock);
+       spin_lock(&ptype_lock);
+       list_add_rcu(&pt->list, head);
+       spin_unlock(&ptype_lock);
 }
 EXPORT_SYMBOL(dev_add_pack);
 
@@ -414,15 +417,10 @@ EXPORT_SYMBOL(dev_add_pack);
  */
 void __dev_remove_pack(struct packet_type *pt)
 {
-       struct list_head *head;
+       struct list_head *head = ptype_head(pt);
        struct packet_type *pt1;
 
-       spin_lock_bh(&ptype_lock);
-
-       if (pt->type == htons(ETH_P_ALL))
-               head = &ptype_all;
-       else
-               head = &ptype_base[ntohs(pt->type) & PTYPE_HASH_MASK];
+       spin_lock(&ptype_lock);
 
        list_for_each_entry(pt1, head, list) {
                if (pt == pt1) {
@@ -433,7 +431,7 @@ void __dev_remove_pack(struct packet_type *pt)
 
        printk(KERN_WARNING "dev_remove_pack: %p not found.\n", pt);
 out:
-       spin_unlock_bh(&ptype_lock);
+       spin_unlock(&ptype_lock);
 }
 EXPORT_SYMBOL(__dev_remove_pack);
 

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 96c1955b3e2f5b47181c6fe331b581fc161baf27..dcfe7e961c104cea1f4e3ab496ef0a7a361cb30e 100644 (file)
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -55,7 +55,7 @@
  *             Stuart Cheshire :       Metricom and grat arp fixes
  *                                     *** FOR 2.1 clean this up ***
  *             Lawrence V. Stefani: (08/12/96) Added FDDI support.
- *             Alan Cox        :       Took the AP1000 nasty FDDI hack and
+ *             Alan Cox        :       Took the AP1000 nasty FDDI hack and
  *                                     folded into the mainstream FDDI code.
  *                                     Ack spit, Linus how did you allow that
  *                                     one in...
@@ -120,7 +120,7 @@ EXPORT_SYMBOL(clip_tbl_hook);
 #endif
 
 #include <asm/system.h>
-#include <asm/uaccess.h>
+#include <linux/uaccess.h>
 
 #include <linux/netfilter_arp.h>
 
@@ -173,32 +173,32 @@ const struct neigh_ops arp_broken_ops = {
 EXPORT_SYMBOL(arp_broken_ops);
 
 struct neigh_table arp_tbl = {
-       .family =       AF_INET,
-       .entry_size =   sizeof(struct neighbour) + 4,
-       .key_len =      4,
-       .hash =         arp_hash,
-       .constructor =  arp_constructor,
-       .proxy_redo =   parp_redo,
-       .id =           "arp_cache",
-       .parms = {
-               .tbl =                  &arp_tbl,
-               .base_reachable_time =  30 * HZ,
-               .retrans_time = 1 * HZ,
-               .gc_staletime = 60 * HZ,
-               .reachable_time =               30 * HZ,
-               .delay_probe_time =     5 * HZ,
-               .queue_len =            3,
-               .ucast_probes = 3,
-               .mcast_probes = 3,
-               .anycast_delay =        1 * HZ,
-               .proxy_delay =          (8 * HZ) / 10,
-               .proxy_qlen =           64,
-               .locktime =             1 * HZ,
+       .family         = AF_INET,
+       .entry_size     = sizeof(struct neighbour) + 4,
+       .key_len        = 4,
+       .hash           = arp_hash,
+       .constructor    = arp_constructor,
+       .proxy_redo     = parp_redo,
+       .id             = "arp_cache",
+       .parms          = {
+               .tbl                    = &arp_tbl,
+               .base_reachable_time    = 30 * HZ,
+               .retrans_time           = 1 * HZ,
+               .gc_staletime           = 60 * HZ,
+               .reachable_time         = 30 * HZ,
+               .delay_probe_time       = 5 * HZ,
+               .queue_len              = 3,
+               .ucast_probes           = 3,
+               .mcast_probes           = 3,
+               .anycast_delay          = 1 * HZ,
+               .proxy_delay            = (8 * HZ) / 10,
+               .proxy_qlen             = 64,
+               .locktime               = 1 * HZ,
        },
-       .gc_interval =  30 * HZ,
-       .gc_thresh1 =   128,
-       .gc_thresh2 =   512,
-       .gc_thresh3 =   1024,
+       .gc_interval    = 30 * HZ,
+       .gc_thresh1     = 128,
+       .gc_thresh2     = 512,
+       .gc_thresh3     = 1024,
 };
 EXPORT_SYMBOL(arp_tbl);
 
@@ -233,7 +233,7 @@ static u32 arp_hash(const void *pkey, const struct net_device *dev)
 
 static int arp_constructor(struct neighbour *neigh)
 {
-       __be32 addr = *(__be32*)neigh->primary_key;
+       __be32 addr = *(__be32 *)neigh->primary_key;
        struct net_device *dev = neigh->dev;
        struct in_device *in_dev;
        struct neigh_parms *parms;
@@ -296,16 +296,19 @@ static int arp_constructor(struct neighbour *neigh)
                        neigh->ops = &arp_broken_ops;
                        neigh->output = neigh->ops->output;
                        return 0;
+#else
+                       break;
 #endif
-               ;}
+               }
 #endif
                if (neigh->type == RTN_MULTICAST) {
                        neigh->nud_state = NUD_NOARP;
                        arp_mc_map(addr, neigh->ha, dev, 1);
-               } else if (dev->flags&(IFF_NOARP|IFF_LOOPBACK)) {
+               } else if (dev->flags & (IFF_NOARP | IFF_LOOPBACK)) {
                        neigh->nud_state = NUD_NOARP;
                        memcpy(neigh->ha, dev->dev_addr, dev->addr_len);
-               } else if (neigh->type == RTN_BROADCAST || dev->flags&IFF_POINTOPOINT) {
+               } else if (neigh->type == RTN_BROADCAST ||
+                          (dev->flags & IFF_POINTOPOINT)) {
                        neigh->nud_state = NUD_NOARP;
                        memcpy(neigh->ha, dev->broadcast, dev->addr_len);
                }
@@ -315,7 +318,7 @@ static int arp_constructor(struct neighbour *neigh)
                else
                        neigh->ops = &arp_generic_ops;
 
-               if (neigh->nud_state&NUD_VALID)
+               if (neigh->nud_state & NUD_VALID)
                        neigh->output = neigh->ops->connected_output;
                else
                        neigh->output = neigh->ops->output;
@@ -334,7 +337,7 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)
        __be32 saddr = 0;
        u8  *dst_ha = NULL;
        struct net_device *dev = neigh->dev;
-       __be32 target = *(__be32*)neigh->primary_key;
+       __be32 target = *(__be32 *)neigh->primary_key;
        int probes = atomic_read(&neigh->probes);
        struct in_device *in_dev;
 
@@ -347,7 +350,8 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)
        switch (IN_DEV_ARP_ANNOUNCE(in_dev)) {
        default:
        case 0:         /* By default announce any local IP */
-               if (skb && inet_addr_type(dev_net(dev), ip_hdr(skb)->saddr) == RTN_LOCAL)
+               if (skb && inet_addr_type(dev_net(dev),
+                                         ip_hdr(skb)->saddr) == RTN_LOCAL)
                        saddr = ip_hdr(skb)->saddr;
                break;
        case 1:         /* Restrict announcements of saddr in same subnet */
@@ -369,16 +373,21 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb)
        if (!saddr)
                saddr = inet_select_addr(dev, target, RT_SCOPE_LINK);
 
-       if ((probes -= neigh->parms->ucast_probes) < 0) {
-               if (!(neigh->nud_state&NUD_VALID))
-                       printk(KERN_DEBUG "trying to ucast probe in NUD_INVALID\n");
+       probes -= neigh->parms->ucast_probes;
+       if (probes < 0) {
+               if (!(neigh->nud_state & NUD_VALID))
+                       printk(KERN_DEBUG
+                              "trying to ucast probe in NUD_INVALID\n");
                dst_ha = neigh->ha;
                read_lock_bh(&neigh->lock);
-       } else if ((probes -= neigh->parms->app_probes) < 0) {
+       } else {
+               probes -= neigh->parms->app_probes;
+               if (probes < 0) {
 #ifdef CONFIG_ARPD
-               neigh_app_ns(neigh);
+                       neigh_app_ns(neigh);
 #endif
-               return;
+                       return;
+               }
        }
 
        arp_send(ARPOP_REQUEST, ETH_P_ARP, target, dev, saddr,
@@ -451,7 +460,8 @@ static int arp_filter(__be32 sip, __be32 tip, struct net_device *dev)
  *     is allowed to use this function, it is scheduled to be removed. --ANK
  */
 
-static int arp_set_predefined(int addr_hint, unsigned char * haddr, __be32 paddr, struct net_device * dev)
+static int arp_set_predefined(int addr_hint, unsigned char *haddr,
+                             __be32 paddr, struct net_device *dev)
 {
        switch (addr_hint) {
        case RTN_LOCAL:
@@ -483,7 +493,8 @@ int arp_find(unsigned char *haddr, struct sk_buff *skb)
 
        paddr = skb_rtable(skb)->rt_gateway;
 
-       if (arp_set_predefined(inet_addr_type(dev_net(dev), paddr), haddr, paddr, dev))
+       if (arp_set_predefined(inet_addr_type(dev_net(dev), paddr), haddr,
+                              paddr, dev))
                return 0;
 
        n = __neigh_lookup(&arp_tbl, &paddr, dev, 1);
@@ -515,13 +526,14 @@ int arp_bind_neighbour(struct dst_entry *dst)
                return -EINVAL;
        if (n == NULL) {
                __be32 nexthop = ((struct rtable *)dst)->rt_gateway;
-               if (dev->flags&(IFF_LOOPBACK|IFF_POINTOPOINT))
+               if (dev->flags & (IFF_LOOPBACK | IFF_POINTOPOINT))
                        nexthop = 0;
                n = __neigh_lookup_errno(
 #if defined(CONFIG_ATM_CLIP) || defined(CONFIG_ATM_CLIP_MODULE)
-                   dev->type == ARPHRD_ATM ? clip_tbl_hook :
+                                        dev->type == ARPHRD_ATM ?
+                                        clip_tbl_hook :
 #endif
-                   &arp_tbl, &nexthop, dev);
+                                        &arp_tbl, &nexthop, dev);
                if (IS_ERR(n))
                        return PTR_ERR(n);
                dst->neighbour = n;
@@ -543,8 +555,8 @@ static inline int arp_fwd_proxy(struct in_device *in_dev,
 
        if (!IN_DEV_PROXY_ARP(in_dev))
                return 0;
-
-       if ((imi = IN_DEV_MEDIUM_ID(in_dev)) == 0)
+       imi = IN_DEV_MEDIUM_ID(in_dev);
+       if (imi == 0)
                return 1;
        if (imi == -1)
                return 0;
@@ -685,7 +697,7 @@ struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip,
        arp->ar_pln = 4;
        arp->ar_op = htons(type);
 
-       arp_ptr=(unsigned char *)(arp+1);
+       arp_ptr = (unsigned char *)(arp + 1);
 
        memcpy(arp_ptr, src_hw, dev->addr_len);
        arp_ptr += dev->addr_len;
@@ -735,9 +747,8 @@ void arp_send(int type, int ptype, __be32 dest_ip,
 
        skb = arp_create(type, ptype, dest_ip, dev, src_ip,
                         dest_hw, src_hw, target_hw);
-       if (skb == NULL) {
+       if (skb == NULL)
                return;
-       }
 
        arp_xmit(skb);
 }
@@ -815,7 +826,7 @@ static int arp_process(struct sk_buff *skb)
 /*
  *     Extract fields
  */
-       arp_ptr= (unsigned char *)(arp+1);
+       arp_ptr = (unsigned char *)(arp + 1);
        sha     = arp_ptr;
        arp_ptr += dev->addr_len;
        memcpy(&sip, arp_ptr, 4);
@@ -869,16 +880,17 @@ static int arp_process(struct sk_buff *skb)
                addr_type = rt->rt_type;
 
                if (addr_type == RTN_LOCAL) {
-                       int dont_send = 0;
+                       int dont_send;
 
-                       if (!dont_send)
-                               dont_send |= arp_ignore(in_dev,sip,tip);
+                       dont_send = arp_ignore(in_dev, sip, tip);
                        if (!dont_send && IN_DEV_ARPFILTER(in_dev))
-                               dont_send |= arp_filter(sip,tip,dev);
+                               dont_send |= arp_filter(sip, tip, dev);
                        if (!dont_send) {
                                n = neigh_event_ns(&arp_tbl, sha, &sip, dev);
                                if (n) {
-                                       arp_send(ARPOP_REPLY,ETH_P_ARP,sip,dev,tip,sha,dev->dev_addr,sha);
+                                       arp_send(ARPOP_REPLY, ETH_P_ARP, sip,
+                                                dev, tip, sha, dev->dev_addr,
+                                                sha);
                                        neigh_release(n);
                                }
                        }
@@ -887,8 +899,7 @@ static int arp_process(struct sk_buff *skb)
                        if (addr_type == RTN_UNICAST  &&
                            (arp_fwd_proxy(in_dev, dev, rt) ||
                             arp_fwd_pvlan(in_dev, dev, rt, sip, tip) ||
-                            pneigh_lookup(&arp_tbl, net, &tip, dev, 0)))
-                       {
+                            pneigh_lookup(&arp_tbl, net, &tip, dev, 0))) {
                                n = neigh_event_ns(&arp_tbl, sha, &sip, dev);
                                if (n)
                                        neigh_release(n);
@@ -896,9 +907,12 @@ static int arp_process(struct sk_buff *skb)
                                if (NEIGH_CB(skb)->flags & LOCALLY_ENQUEUED ||
                                    skb->pkt_type == PACKET_HOST ||
                                    in_dev->arp_parms->proxy_delay == 0) {
-                                       arp_send(ARPOP_REPLY,ETH_P_ARP,sip,dev,tip,sha,dev->dev_addr,sha);
+                                       arp_send(ARPOP_REPLY, ETH_P_ARP, sip,
+                                                dev, tip, sha, dev->dev_addr,
+                                                sha);
                                } else {
-                                       pneigh_enqueue(&arp_tbl, in_dev->arp_parms, skb);
+                                       pneigh_enqueue(&arp_tbl,
+                                                      in_dev->arp_parms, skb);
                                        return 0;
                                }
                                goto out;
@@ -939,7 +953,8 @@ static int arp_process(struct sk_buff *skb)
                if (arp->ar_op != htons(ARPOP_REPLY) ||
                    skb->pkt_type != PACKET_HOST)
                        state = NUD_STALE;
-               neigh_update(n, sha, state, override ? NEIGH_UPDATE_F_OVERRIDE : 0);
+               neigh_update(n, sha, state,
+                            override ? NEIGH_UPDATE_F_OVERRIDE : 0);
                neigh_release(n);
        }
 
@@ -975,7 +990,8 @@ static int arp_rcv(struct sk_buff *skb, struct net_device *dev,
            arp->ar_pln != 4)
                goto freeskb;
 
-       if ((skb = skb_share_check(skb, GFP_ATOMIC)) == NULL)
+       skb = skb_share_check(skb, GFP_ATOMIC);
+       if (skb == NULL)
                goto out_of_mem;
 
        memset(NEIGH_CB(skb), 0, sizeof(struct neighbour_cb));
@@ -1019,7 +1035,7 @@ static int arp_req_set_public(struct net *net, struct arpreq *r,
                return -EINVAL;
        if (!dev && (r->arp_flags & ATF_COM)) {
                dev = dev_getbyhwaddr(net, r->arp_ha.sa_family,
-                               r->arp_ha.sa_data);
+                                     r->arp_ha.sa_data);
                if (!dev)
                        return -ENODEV;
        }
@@ -1033,7 +1049,7 @@ static int arp_req_set_public(struct net *net, struct arpreq *r,
 }
 
 static int arp_req_set(struct net *net, struct arpreq *r,
-               struct net_device * dev)
+                      struct net_device *dev)
 {
        __be32 ip;
        struct neighbour *neigh;
@@ -1046,10 +1062,11 @@ static int arp_req_set(struct net *net, struct arpreq *r,
        if (r->arp_flags & ATF_PERM)
                r->arp_flags |= ATF_COM;
        if (dev == NULL) {
-               struct flowi fl = { .nl_u = { .ip4_u = { .daddr = ip,
-                                                        .tos = RTO_ONLINK } } };
-               struct rtable * rt;
-               if ((err = ip_route_output_key(net, &rt, &fl)) != 0)
+               struct flowi fl = { .nl_u.ip4_u = { .daddr = ip,
+                                                   .tos = RTO_ONLINK } };
+               struct rtable *rt;
+               err = ip_route_output_key(net, &rt, &fl);
+               if (err != 0)
                        return err;
                dev = rt->dst.dev;
                ip_rt_put(rt);
@@ -1083,9 +1100,9 @@ static int arp_req_set(struct net *net, struct arpreq *r,
                unsigned state = NUD_STALE;
                if (r->arp_flags & ATF_PERM)
                        state = NUD_PERMANENT;
-               err = neigh_update(neigh, (r->arp_flags&ATF_COM) ?
+               err = neigh_update(neigh, (r->arp_flags & ATF_COM) ?
                                   r->arp_ha.sa_data : NULL, state,
-                                  NEIGH_UPDATE_F_OVERRIDE|
+                                  NEIGH_UPDATE_F_OVERRIDE |
                                   NEIGH_UPDATE_F_ADMIN);
                neigh_release(neigh);
        }
@@ -1094,12 +1111,12 @@ static int arp_req_set(struct net *net, struct arpreq *r,
 
 static unsigned arp_state_to_flags(struct neighbour *neigh)
 {
-       unsigned flags = 0;
        if (neigh->nud_state&NUD_PERMANENT)
-               flags = ATF_PERM|ATF_COM;
+               return ATF_PERM | ATF_COM;
        else if (neigh->nud_state&NUD_VALID)
-               flags = ATF_COM;
-       return flags;
+               return ATF_COM;
+       else
+               return 0;
 }
 
 /*
@@ -1142,7 +1159,7 @@ static int arp_req_delete_public(struct net *net, struct arpreq *r,
 }
 
 static int arp_req_delete(struct net *net, struct arpreq *r,
-               struct net_device * dev)
+                         struct net_device *dev)
 {
        int err;
        __be32 ip;
@@ -1153,10 +1170,11 @@ static int arp_req_delete(struct net *net, struct arpreq *r,
 
        ip = ((struct sockaddr_in *)&r->arp_pa)->sin_addr.s_addr;
        if (dev == NULL) {
-               struct flowi fl = { .nl_u = { .ip4_u = { .daddr = ip,
-                                                        .tos = RTO_ONLINK } } };
-               struct rtable * rt;
-               if ((err = ip_route_output_key(net, &rt, &fl)) != 0)
+               struct flowi fl = { .nl_u.ip4_u = { .daddr = ip,
+                                                   .tos = RTO_ONLINK } };
+               struct rtable *rt;
+               err = ip_route_output_key(net, &rt, &fl);
+               if (err != 0)
                        return err;
                dev = rt->dst.dev;
                ip_rt_put(rt);
@@ -1166,7 +1184,7 @@ static int arp_req_delete(struct net *net, struct arpreq *r,
        err = -ENXIO;
        neigh = neigh_lookup(&arp_tbl, &ip, dev);
        if (neigh) {
-               if (neigh->nud_state&~NUD_NOARP)
+               if (neigh->nud_state & ~NUD_NOARP)
                        err = neigh_update(neigh, NULL, NUD_FAILED,
                                           NEIGH_UPDATE_F_OVERRIDE|
                                           NEIGH_UPDATE_F_ADMIN);
@@ -1186,24 +1204,24 @@ int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg)
        struct net_device *dev = NULL;
 
        switch (cmd) {
-               case SIOCDARP:
-               case SIOCSARP:
-                       if (!capable(CAP_NET_ADMIN))
-                               return -EPERM;
-               case SIOCGARP:
-                       err = copy_from_user(&r, arg, sizeof(struct arpreq));
-                       if (err)
-                               return -EFAULT;
-                       break;
-               default:
-                       return -EINVAL;
+       case SIOCDARP:
+       case SIOCSARP:
+               if (!capable(CAP_NET_ADMIN))
+                       return -EPERM;
+       case SIOCGARP:
+               err = copy_from_user(&r, arg, sizeof(struct arpreq));
+               if (err)
+                       return -EFAULT;
+               break;
+       default:
+               return -EINVAL;
        }
 
        if (r.arp_pa.sa_family != AF_INET)
                return -EPFNOSUPPORT;
 
        if (!(r.arp_flags & ATF_PUBL) &&
-           (r.arp_flags & (ATF_NETMASK|ATF_DONTPUB)))
+           (r.arp_flags & (ATF_NETMASK | ATF_DONTPUB)))
                return -EINVAL;
        if (!(r.arp_flags & ATF_NETMASK))
                ((struct sockaddr_in *)&r.arp_netmask)->sin_addr.s_addr =
@@ -1211,7 +1229,8 @@ int arp_ioctl(struct net *net, unsigned int cmd, void __user *arg)
        rtnl_lock();
        if (r.arp_dev[0]) {
                err = -ENODEV;
-               if ((dev = __dev_get_by_name(net, r.arp_dev)) == NULL)
+               dev = __dev_get_by_name(net, r.arp_dev);
+               if (dev == NULL)
                        goto out;
 
                /* Mmmm... It is wrong... ARPHRD_NETROM==0 */
@@ -1243,7 +1262,8 @@ out:
        return err;
 }
 
-static int arp_netdev_event(struct notifier_block *this, unsigned long event, void *ptr)
+static int arp_netdev_event(struct notifier_block *this, unsigned long event,
+                           void *ptr)
 {
        struct net_device *dev = ptr;
 
@@ -1311,12 +1331,13 @@ static char *ax2asc2(ax25_address *a, char *buf)
        for (n = 0, s = buf; n < 6; n++) {
                c = (a->ax25_call[n] >> 1) & 0x7F;
 
-               if (c != ' ') *s++ = c;
+               if (c != ' ')
+                       *s++ = c;
        }
 
        *s++ = '-';
-
-       if ((n = ((a->ax25_call[6] >> 1) & 0x0F)) > 9) {
+       n = (a->ax25_call[6] >> 1) & 0x0F;
+       if (n > 9) {
                *s++ = '1';
                n -= 10;
        }
@@ -1325,10 +1346,9 @@ static char *ax2asc2(ax25_address *a, char *buf)
        *s++ = '\0';
 
        if (*buf == '\0' || *buf == '-')
-          return "*";
+               return "*";
 
        return buf;
-
 }
 #endif /* CONFIG_AX25 */
 
@@ -1408,10 +1428,10 @@ static void *arp_seq_start(struct seq_file *seq, loff_t *pos)
 /* ------------------------------------------------------------------------ */
 
 static const struct seq_operations arp_seq_ops = {
-       .start  = arp_seq_start,
-       .next   = neigh_seq_next,
-       .stop   = neigh_seq_stop,
-       .show   = arp_seq_show,
+       .start  = arp_seq_start,
+       .next   = neigh_seq_next,
+       .stop   = neigh_seq_stop,
+       .show   = arp_seq_show,
 };
 
 static int arp_seq_open(struct inode *inode, struct file *file)

diff --git a/net/l2tp/l2tp_eth.c b/net/l2tp/l2tp_eth.c
index 58c6c4cda73b576cd65d3121a9abdf67bc6f7668..f3468ba3f5cbdd0c262e6cc5f77c176b5cb5d363 100644 (file)
--- a/net/l2tp/l2tp_eth.c
+++ b/net/l2tp/l2tp_eth.c
@@ -144,7 +144,6 @@ static void l2tp_eth_dev_recv(struct l2tp_session *session, struct sk_buff *skb,
        nf_reset(skb);
 
        if (dev_forward_skb(dev, skb) == NET_RX_SUCCESS) {
-               dev->last_rx = jiffies;
                dev->stats.rx_packets++;
                dev->stats.rx_bytes += data_len;
        } else

diff --git a/net/netfilter/ipvs/ip_vs_core.c b/net/netfilter/ipvs/ip_vs_core.c
index edbfb96b935eea0a2d1019504fb792d4bd439377..b7ce5b441b3876788819162e7a802aac337d678c 100644 (file)
--- a/net/netfilter/ipvs/ip_vs_core.c
+++ b/net/netfilter/ipvs/ip_vs_core.c
@@ -1383,8 +1383,7 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb,
        if (af == AF_INET && (ip_vs_sync_state & IP_VS_STATE_MASTER) &&
            cp->protocol == IPPROTO_SCTP) {
                if ((cp->state == IP_VS_SCTP_S_ESTABLISHED &&
-                       (atomic_read(&cp->in_pkts) %
-                        sysctl_ip_vs_sync_threshold[1]
+                       (pkts % sysctl_ip_vs_sync_threshold[1]
                         == sysctl_ip_vs_sync_threshold[0])) ||
                                (cp->old_state != cp->state &&
                                 ((cp->state == IP_VS_SCTP_S_CLOSED) ||
@@ -1395,7 +1394,8 @@ ip_vs_in(unsigned int hooknum, struct sk_buff *skb,
                }
        }
 
-       if (af == AF_INET &&
+       /* Keep this block last: TCP and others with pp->num_states <= 1 */
+       else if (af == AF_INET &&
            (ip_vs_sync_state & IP_VS_STATE_MASTER) &&
            (((cp->protocol != IPPROTO_TCP ||
               cp->state == IP_VS_TCP_S_ESTABLISHED) &&