From: David S. Miller <davem@davemloft.net>
Date: Wed, 19 Jan 2011 00:28:31 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.39-rc1~468^2~526
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=a5db219f4cf9f67995eabd53b81a1232c82f5852;hp=-c

Merge branch 'master' of /linux/kernel/git/davem/net-2.6
---

a5db219f4cf9f67995eabd53b81a1232c82f5852
diff --combined drivers/net/bnx2x/bnx2x.h
index a6cd335c9436,e56a45c3e739..8e4183717d91
--- a/drivers/net/bnx2x/bnx2x.h
+++ b/drivers/net/bnx2x/bnx2x.h
@@@ -22,8 -22,8 +22,8 @@@
   * (you will need to reboot afterwards) */
  /* #define BNX2X_STOP_ON_ERROR */
  
- #define DRV_MODULE_VERSION      "1.62.00-3"
- #define DRV_MODULE_RELDATE      "2010/12/21"
+ #define DRV_MODULE_VERSION      "1.62.00-4"
+ #define DRV_MODULE_RELDATE      "2011/01/18"
  #define BNX2X_BC_VER            0x040200
  
  #define BNX2X_MULTI_QUEUE
@@@ -1415,12 -1415,12 +1415,12 @@@ struct bnx2x_func_init_params 
  		else
  
  /* skip rx queue
 - * if FCOE l2 support is diabled and this is the fcoe L2 queue
 + * if FCOE l2 support is disabled and this is the fcoe L2 queue
   */
  #define skip_rx_queue(bp, idx)	(NO_FCOE(bp) && IS_FCOE_IDX(idx))
  
  /* skip tx queue
 - * if FCOE l2 support is diabled and this is the fcoe L2 queue
 + * if FCOE l2 support is disabled and this is the fcoe L2 queue
   */
  #define skip_tx_queue(bp, idx)	(NO_FCOE(bp) && IS_FCOE_IDX(idx))
  
diff --combined drivers/net/bnx2x/bnx2x_reg.h
index c939683e3d61,73efc9bbfe7c..e01330bb36c7
--- a/drivers/net/bnx2x/bnx2x_reg.h
+++ b/drivers/net/bnx2x/bnx2x_reg.h
@@@ -1633,7 -1633,7 +1633,7 @@@
     (~misc_registers_sw_timer_cfg_4.sw_timer_cfg_4[1] ) is set */
  #define MISC_REG_SW_TIMER_RELOAD_VAL_4				 0xa2fc
  /* [RW 32] the value of the counter for sw timers1-8. there are 8 addresses
 -   in this register. addres 0 - timer 1; address 1 - timer 2, ...  address 7 -
 +   in this register. address 0 - timer 1; address 1 - timer 2, ...  address 7 -
     timer 8 */
  #define MISC_REG_SW_TIMER_VAL					 0xa5c0
  /* [RW 1] Set by the MCP to remember if one or more of the drivers is/are
@@@ -6194,7 -6194,11 +6194,11 @@@ Theotherbitsarereservedandshouldbezero*
  #define MDIO_CTL_REG_84823_MEDIA_PRIORITY_COPPER	0x0000
  #define MDIO_CTL_REG_84823_MEDIA_PRIORITY_FIBER		0x0100
  #define MDIO_CTL_REG_84823_MEDIA_FIBER_1G			0x1000
+ #define MDIO_CTL_REG_84823_USER_CTRL_REG		0x4005
+ #define MDIO_CTL_REG_84823_USER_CTRL_CMS		0x0080
  
+ #define MDIO_PMA_REG_84823_CTL_LED_CTL_1		0xa8e3
+ #define MDIO_PMA_REG_84823_LED3_STRETCH_EN		0x0080
  
  #define IGU_FUNC_BASE			0x0400
  
diff --combined drivers/net/gianfar.c
index 119aa2000c24,5f4ea0f46596..5ed8f9f9419f
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@@ -95,7 -95,6 +95,7 @@@
  #include <linux/phy.h>
  #include <linux/phy_fixed.h>
  #include <linux/of.h>
 +#include <linux/of_net.h>
  
  #include "gianfar.h"
  #include "fsl_pq_mdio.h"
@@@ -1920,7 -1919,7 +1920,7 @@@ int startup_gfar(struct net_device *nde
  		if (err) {
  			for (j = 0; j < i; j++)
  				free_grp_irqs(&priv->gfargrp[j]);
- 				goto irq_fail;
+ 			goto irq_fail;
  		}
  	}
  
diff --combined net/core/dev.c
index 54277df0f735,4c58d11d3b68..7741507429f4
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@@ -2023,13 -2023,13 +2023,13 @@@ int netif_skb_features(struct sk_buff *
  		return harmonize_features(skb, protocol, features);
  	}
  
- 	features &= skb->dev->vlan_features;
+ 	features &= (skb->dev->vlan_features | NETIF_F_HW_VLAN_TX);
  
  	if (protocol != htons(ETH_P_8021Q)) {
  		return harmonize_features(skb, protocol, features);
  	} else {
  		features &= NETIF_F_SG | NETIF_F_HIGHDMA | NETIF_F_FRAGLIST |
- 				NETIF_F_GEN_CSUM;
+ 				NETIF_F_GEN_CSUM | NETIF_F_HW_VLAN_TX;
  		return harmonize_features(skb, protocol, features);
  	}
  }
@@@ -6189,7 -6189,7 +6189,7 @@@ static void __net_exit default_device_e
  static void __net_exit default_device_exit_batch(struct list_head *net_list)
  {
  	/* At exit all network devices most be removed from a network
 -	 * namespace.  Do this in the reverse order of registeration.
 +	 * namespace.  Do this in the reverse order of registration.
  	 * Do this across as many network namespaces as possible to
  	 * improve batching efficiency.
  	 */