Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (217 commits)
  net/ieee80211: fix more crypto-related build breakage
  [PATCH] Spidernet: add ethtool -S (show statistics)
  [NET] GT96100: Delete bitrotting ethernet driver
  [PATCH] mv643xx_eth: restrict to 32-bit PPC_MULTIPLATFORM
  [PATCH] Cirrus Logic ep93xx ethernet driver
  r8169: the MMIO region of the 8167 stands behin BAR#1
  e1000, ixgb: Remove pointless wrappers
  [PATCH] Remove powerpc specific parts of 3c509 driver
  [PATCH] s2io: Switch to pci_get_device
  [PATCH] gt96100: move to pci_get_device API
  [PATCH] ehea: bugfix for register access functions
  [PATCH] e1000 disable device on PCI error
  drivers/net/phy/fixed: #if 0 some incomplete code
  drivers/net: const-ify ethtool_ops declarations
  [PATCH] ethtool: allow const ethtool_ops
  [PATCH] sky2: big endian
  [PATCH] sky2: fiber support
  [PATCH] sky2: tx pause bug fix
  drivers/net: Trim trailing whitespace
  [PATCH] ehea: IBM eHEA Ethernet Device Driver
  ...

Manually resolved conflicts in drivers/net/ixgb/ixgb_main.c and
drivers/net/sky2.c related to CHECKSUM_HW/CHECKSUM_PARTIAL changes by
commit 84fa7933a33f806bbbaae6775e87459b1ec584c0 that just happened to be
next to unrelated changes in this update.

1 files changed, 8 insertions, 8 deletions

diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 0d101a18026a..5666ed998142 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -386,13 +386,13 @@ static int pppoe_rcv(struct sk_buff *skb,
         if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
                 goto drop;
 
-        if (!(skb = skb_share_check(skb, GFP_ATOMIC))) 
+        if (!(skb = skb_share_check(skb, GFP_ATOMIC)))
                 goto out;
 
         ph = (struct pppoe_hdr *) skb->nh.raw;
 
         po = get_item((unsigned long) ph->sid, eth_hdr(skb)->h_source);
-        if (po != NULL) 
+        if (po != NULL)
                 return sk_receive_skb(sk_pppox(po), skb);
 drop:
         kfree_skb(skb);
@@ -418,7 +418,7 @@ static int pppoe_disc_rcv(struct sk_buff *skb,
         if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
                 goto abort;
 
-        if (!(skb = skb_share_check(skb, GFP_ATOMIC))) 
+        if (!(skb = skb_share_check(skb, GFP_ATOMIC)))
                 goto out;
 
         ph = (struct pppoe_hdr *) skb->nh.raw;
@@ -745,7 +745,7 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd,
 }
 
 
-static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock, 
+static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock,
                   struct msghdr *m, size_t total_len)
 {
         struct sk_buff *skb = NULL;
@@ -907,8 +907,8 @@ static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb)
 }
 
 
-static struct ppp_channel_ops pppoe_chan_ops = { 
-        .start_xmit = pppoe_xmit, 
+static struct ppp_channel_ops pppoe_chan_ops = {
+        .start_xmit = pppoe_xmit,
 };
 
 static int pppoe_recvmsg(struct kiocb *iocb, struct socket *sock,
@@ -1010,7 +1010,7 @@ static void *pppoe_seq_next(struct seq_file *seq, void *v, loff_t *pos)
                 goto out;
         }
         po = v;
-        if (po->next) 
+        if (po->next)
                 po = po->next;
         else {
                 int hash = hash_item(po->pppoe_pa.sid, po->pppoe_pa.remote);
@@ -1106,7 +1106,7 @@ static int __init pppoe_init(void)
         err = pppoe_proc_init();
         if (err)
                 goto out_unregister_pppox_proto;
-        
+
         dev_add_pack(&pppoes_ptype);
         dev_add_pack(&pppoed_ptype);
         register_netdevice_notifier(&pppoe_notifier);