Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next-2.6: (1429 commits)
  net: Allow dependancies of FDDI & Tokenring to be modular.
  igb: Fix build warning when DCA is disabled.
  net: Fix warning fallout from recent NAPI interface changes.
  gro: Fix potential use after free
  sfc: If AN is enabled, always read speed/duplex from the AN advertising bits
  sfc: When disabling the NIC, close the device rather than unregistering it
  sfc: SFT9001: Add cable diagnostics
  sfc: Add support for multiple PHY self-tests
  sfc: Merge top-level functions for self-tests
  sfc: Clean up PHY mode management in loopback self-test
  sfc: Fix unreliable link detection in some loopback modes
  sfc: Generate unique names for per-NIC workqueues
  802.3ad: use standard ethhdr instead of ad_header
  802.3ad: generalize out mac address initializer
  802.3ad: initialize ports LACPDU from const initializer
  802.3ad: remove typedef around ad_system
  802.3ad: turn ports is_individual into a bool
  802.3ad: turn ports is_enabled into a bool
  802.3ad: make ntt bool
  ixgbe: Fix set_ringparam in ixgbe to use the same memory pools.
  ...

Fixed trivial IPv4/6 address printing conflicts in fs/cifs/connect.c due
to the conversion to %pI (in this networking merge) and the addition of
doing IPv6 addresses (from the earlier merge of CIFS).

1 files changed, 14 insertions, 21 deletions

diff --git a/drivers/net/plip.c b/drivers/net/plip.c
index 1e965427b0e9..0c46d603b8fe 100644
--- a/drivers/net/plip.c
+++ b/drivers/net/plip.c
@@ -229,7 +229,7 @@ static inline void enable_parport_interrupts (struct net_device *dev)
         if (dev->irq != -1)
         {
                 struct parport *port =
-                   ((struct net_local *)dev->priv)->pardev->port;
+                   ((struct net_local *)netdev_priv(dev))->pardev->port;
                 port->ops->enable_irq (port);
         }
 }
@@ -239,7 +239,7 @@ static inline void disable_parport_interrupts (struct net_device *dev)
         if (dev->irq != -1)
         {
                 struct parport *port =
-                   ((struct net_local *)dev->priv)->pardev->port;
+                   ((struct net_local *)netdev_priv(dev))->pardev->port;
                 port->ops->disable_irq (port);
         }
 }
@@ -247,7 +247,7 @@ static inline void disable_parport_interrupts (struct net_device *dev)
 static inline void write_data (struct net_device *dev, unsigned char data)
 {
         struct parport *port =
-           ((struct net_local *)dev->priv)->pardev->port;
+           ((struct net_local *)netdev_priv(dev))->pardev->port;
 
         port->ops->write_data (port, data);
 }
@@ -255,7 +255,7 @@ static inline void write_data (struct net_device *dev, unsigned char data)
 static inline unsigned char read_status (struct net_device *dev)
 {
         struct parport *port =
-           ((struct net_local *)dev->priv)->pardev->port;
+           ((struct net_local *)netdev_priv(dev))->pardev->port;
 
         return port->ops->read_status (port);
 }
@@ -638,14 +638,14 @@ plip_receive_packet(struct net_device *dev, struct net_local *nl,
 
         case PLIP_PK_DATA:
                 lbuf = rcv->skb->data;
-                do
+                do {
                         if (plip_receive(nibble_timeout, dev,
                                          &rcv->nibble, &lbuf[rcv->byte]))
                                 return TIMEOUT;
-                while (++rcv->byte < rcv->length.h);
-                do
+                } while (++rcv->byte < rcv->length.h);
+                do {
                         rcv->checksum += lbuf[--rcv->byte];
-                while (rcv->byte);
+                } while (rcv->byte);
                 rcv->state = PLIP_PK_CHECKSUM;
 
         case PLIP_PK_CHECKSUM:
@@ -664,7 +664,6 @@ plip_receive_packet(struct net_device *dev, struct net_local *nl,
                 /* Inform the upper layer for the arrival of a packet. */
                 rcv->skb->protocol=plip_type_trans(rcv->skb, dev);
                 netif_rx_ni(rcv->skb);
-                dev->last_rx = jiffies;
                 dev->stats.rx_bytes += rcv->length.h;
                 dev->stats.rx_packets++;
                 rcv->skb = NULL;
@@ -817,14 +816,14 @@ plip_send_packet(struct net_device *dev, struct net_local *nl,
                 snd->checksum = 0;
 
         case PLIP_PK_DATA:
-                do
+                do {
                         if (plip_send(nibble_timeout, dev,
                                       &snd->nibble, lbuf[snd->byte]))
                                 return TIMEOUT;
-                while (++snd->byte < snd->length.h);
-                do
+                } while (++snd->byte < snd->length.h);
+                do {
                         snd->checksum += lbuf[--snd->byte];
-                while (snd->byte);
+                } while (snd->byte);
                 snd->state = PLIP_PK_CHECKSUM;
 
         case PLIP_PK_CHECKSUM:
@@ -1018,8 +1017,8 @@ plip_hard_header(struct sk_buff *skb, struct net_device *dev,
         return ret;
 }
 
-int plip_hard_header_cache(const struct neighbour *neigh,
-                           struct hh_cache *hh)
+static int plip_hard_header_cache(const struct neighbour *neigh,
+                                  struct hh_cache *hh)
 {
         int ret;
 
@@ -1397,9 +1396,3 @@ static int __init plip_init (void)
 module_init(plip_init);
 module_exit(plip_cleanup_module);
 MODULE_LICENSE("GPL");
-
-/*
- * Local variables:
- * compile-command: "gcc -DMODULE -DMODVERSIONS -D__KERNEL__ -Wall -Wstrict-prototypes -O2 -g -fomit-frame-pointer -pipe -c plip.c"
- * End:
- */