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: (1674 commits)
  qlcnic: adding co maintainer
  ixgbe: add support for active DA cables
  ixgbe: dcb, do not tag tc_prio_control frames
  ixgbe: fix ixgbe_tx_is_paused logic
  ixgbe: always enable vlan strip/insert when DCB is enabled
  ixgbe: remove some redundant code in setting FCoE FIP filter
  ixgbe: fix wrong offset to fc_frame_header in ixgbe_fcoe_ddp
  ixgbe: fix header len when unsplit packet overflows to data buffer
  ipv6: Never schedule DAD timer on dead address
  ipv6: Use POSTDAD state
  ipv6: Use state_lock to protect ifa state
  ipv6: Replace inet6_ifaddr->dead with state
  cxgb4: notify upper drivers if the device is already up when they load
  cxgb4: keep interrupts available when the ports are brought down
  cxgb4: fix initial addition of MAC address
  cnic: Return SPQ credit to bnx2x after ring setup and shutdown.
  cnic: Convert cnic_local_flags to atomic ops.
  can: Fix SJA1000 command register writes on SMP systems
  bridge: fix build for CONFIG_SYSFS disabled
  ARCNET: Limit com20020 PCI ID matches for SOHARD cards
  ...

Fix up various conflicts with pcmcia tree drivers/net/
{pcmcia/3c589_cs.c, wireless/orinoco/orinoco_cs.c and
wireless/orinoco/spectrum_cs.c} and feature removal
(Documentation/feature-removal-schedule.txt).

Also fix a non-content conflict due to pm_qos_requirement getting
renamed in the PM tree (now pm_qos_request) in net/mac80211/scan.c

1 files changed, 15 insertions, 10 deletions

diff --git a/drivers/net/e1000e/param.c b/drivers/net/e1000e/param.c
index 2e399778cae5..a150e48a117f 100644
--- a/drivers/net/e1000e/param.c
+++ b/drivers/net/e1000e/param.c
@@ -248,7 +248,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
         }
 
         { /* Transmit Interrupt Delay */
-                const struct e1000_option opt = {
+                static const struct e1000_option opt = {
                         .type = range_option,
                         .name = "Transmit Interrupt Delay",
                         .err  = "using default of "
@@ -267,7 +267,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Transmit Absolute Interrupt Delay */
-                const struct e1000_option opt = {
+                static const struct e1000_option opt = {
                         .type = range_option,
                         .name = "Transmit Absolute Interrupt Delay",
                         .err  = "using default of "
@@ -286,7 +286,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Receive Interrupt Delay */
-                struct e1000_option opt = {
+                static struct e1000_option opt = {
                         .type = range_option,
                         .name = "Receive Interrupt Delay",
                         .err  = "using default of "
@@ -305,7 +305,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Receive Absolute Interrupt Delay */
-                const struct e1000_option opt = {
+                static const struct e1000_option opt = {
                         .type = range_option,
                         .name = "Receive Absolute Interrupt Delay",
                         .err  = "using default of "
@@ -324,7 +324,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Interrupt Throttling Rate */
-                const struct e1000_option opt = {
+                static const struct e1000_option opt = {
                         .type = range_option,
                         .name = "Interrupt Throttling Rate (ints/sec)",
                         .err  = "using default of "
@@ -351,6 +351,11 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                                 adapter->itr_setting = adapter->itr;
                                 adapter->itr = 20000;
                                 break;
+                        case 4:
+                                e_info("%s set to simplified (2000-8000 ints) "
+                                       "mode\n", opt.name);
+                                adapter->itr_setting = 4;
+                                break;
                         default:
                                 /*
                                  * Save the setting, because the dynamic bits
@@ -381,7 +386,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Interrupt Mode */
-                struct e1000_option opt = {
+                static struct e1000_option opt = {
                         .type = range_option,
                         .name = "Interrupt Mode",
                         .err  = "defaulting to 2 (MSI-X)",
@@ -399,7 +404,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Smart Power Down */
-                const struct e1000_option opt = {
+                static const struct e1000_option opt = {
                         .type = enable_option,
                         .name = "PHY Smart Power Down",
                         .err  = "defaulting to Disabled",
@@ -415,7 +420,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* CRC Stripping */
-                const struct e1000_option opt = {
+                static const struct e1000_option opt = {
                         .type = enable_option,
                         .name = "CRC Stripping",
                         .err  = "defaulting to enabled",
@@ -432,7 +437,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Kumeran Lock Loss Workaround */
-                const struct e1000_option opt = {
+                static const struct e1000_option opt = {
                         .type = enable_option,
                         .name = "Kumeran Lock Loss Workaround",
                         .err  = "defaulting to Enabled",
@@ -452,7 +457,7 @@ void __devinit e1000e_check_options(struct e1000_adapter *adapter)
                 }
         }
         { /* Write-protect NVM */
-                const struct e1000_option opt = {
+                static const struct e1000_option opt = {
                         .type = enable_option,
                         .name = "Write-protect NVM",
                         .err  = "defaulting to Enabled",