]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
authorDavid S. Miller <davem@davemloft.net>
Fri, 17 Dec 2010 20:27:22 +0000 (12:27 -0800)
committerDavid S. Miller <davem@davemloft.net>
Fri, 17 Dec 2010 20:27:22 +0000 (12:27 -0800)
Conflicts:
drivers/net/bnx2x/bnx2x.h
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/vhost/vhost.c

37 files changed:
1  2 
MAINTAINERS
drivers/atm/fore200e.c
drivers/atm/lanai.c
drivers/net/benet/be.h
drivers/net/benet/be_cmds.c
drivers/net/benet/be_main.c
drivers/net/bonding/bond_main.c
drivers/net/bonding/bonding.h
drivers/net/cxgb4vf/cxgb4vf_main.c
drivers/net/enic/enic_main.c
drivers/net/pcmcia/axnet_cs.c
drivers/net/qlge/qlge.h
drivers/net/qlge/qlge_main.c
drivers/net/qlge/qlge_mpi.c
drivers/net/r8169.c
drivers/net/usb/hso.c
drivers/net/wireless/iwlwifi/iwl-1000.c
drivers/net/wireless/iwlwifi/iwl-6000.c
drivers/net/wireless/iwlwifi/iwl-agn-eeprom.c
drivers/net/wireless/iwlwifi/iwl-agn-lib.c
drivers/net/wireless/iwlwifi/iwl-core.h
drivers/net/wireless/iwlwifi/iwl-eeprom.h
drivers/net/wireless/libertas/cfg.c
drivers/net/wireless/p54/p54usb.c
include/net/sock.h
net/bluetooth/rfcomm/core.c
net/bridge/br_multicast.c
net/core/sock.c
net/core/timestamping.c
net/ipv4/udp.c
net/ipv6/addrconf.c
net/ipv6/route.c
net/ipv6/udp.c
net/mac80211/ibss.c
net/mac80211/work.c
net/sctp/socket.c
net/socket.c

diff --cc MAINTAINERS
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 3c983e426f250b01c935cec0dce346de25991c0c,0e027f787fbce6452b0c78fefc24dbd30cb75100..af85458401a499f5e97e7a466ddda0e8d8d77765
@@@ -310,7 -315,7 +310,8 @@@ struct iwl_cfg iwl100_bgn_cfg = 
        .mod_params = &iwlagn_mod_params,
        .base_params = &iwl1000_base_params,
        .ht_params = &iwl1000_ht_params,
 +      .led_mode = IWL_LED_RF_STATE,
+       .use_new_eeprom_reading = true,
  };
  
  struct iwl_cfg iwl100_bg_cfg = {
        .ops = &iwl1000_ops,
        .mod_params = &iwlagn_mod_params,
        .base_params = &iwl1000_base_params,
 +      .led_mode = IWL_LED_RF_STATE,
+       .use_new_eeprom_reading = true,
  };
  
  MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));
index 808942cc2991f3da575a6ea446ed424ba15a4a8a,0ceeaac85eda1ab8a8dd8a046044b47dc5e5df63..a848ca06dc6f379af407da6bffa84c5ef3ea27e0
@@@ -563,11 -561,11 +563,12 @@@ struct iwl_cfg iwl6005_2agn_cfg = 
        .ht_params = &iwl6000_ht_params,
        .need_dc_calib = true,
        .need_temp_offset_calib = true,
 +      .led_mode = IWL_LED_RF_STATE,
+       .use_new_eeprom_reading = true,
  };
  
 -struct iwl_cfg iwl6000g2a_2abg_cfg = {
 -      .name = "6000 Series 2x2 ABG Gen2a",
 +struct iwl_cfg iwl6005_2abg_cfg = {
 +      .name = "Intel(R) Centrino(R) Advanced-N 6205 ABG",
        .fw_name_pre = IWL6000G2A_FW_PRE,
        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
        .base_params = &iwl6000_base_params,
        .need_dc_calib = true,
        .need_temp_offset_calib = true,
 +      .led_mode = IWL_LED_RF_STATE,
+       .use_new_eeprom_reading = true,
  };
  
 -struct iwl_cfg iwl6000g2a_2bg_cfg = {
 -      .name = "6000 Series 2x2 BG Gen2a",
 +struct iwl_cfg iwl6005_2bg_cfg = {
 +      .name = "Intel(R) Centrino(R) Advanced-N 6205 BG",
        .fw_name_pre = IWL6000G2A_FW_PRE,
        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
        .base_params = &iwl6000_base_params,
        .need_dc_calib = true,
        .need_temp_offset_calib = true,
 +      .led_mode = IWL_LED_RF_STATE,
+       .use_new_eeprom_reading = true,
  };
  
 -struct iwl_cfg iwl6000g2b_2agn_cfg = {
 -      .name = "6000 Series 2x2 AGN Gen2b",
 +struct iwl_cfg iwl6030_2agn_cfg = {
 +      .name = "Intel(R) Centrino(R) Advanced-N 6230 AGN",
        .fw_name_pre = IWL6000G2B_FW_PRE,
        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
        .ht_params = &iwl6000_ht_params,
        .need_dc_calib = true,
        .need_temp_offset_calib = true,
 +      .led_mode = IWL_LED_RF_STATE,
 +      .adv_pm = true,
        /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
        .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+       .use_new_eeprom_reading = true,
  };
  
 -struct iwl_cfg iwl6000g2b_2abg_cfg = {
 -      .name = "6000 Series 2x2 ABG Gen2b",
 +struct iwl_cfg iwl6030_2abg_cfg = {
 +      .name = "Intel(R) Centrino(R) Advanced-N 6230 ABG",
        .fw_name_pre = IWL6000G2B_FW_PRE,
        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
        .bt_params = &iwl6000_bt_params,
        .need_dc_calib = true,
        .need_temp_offset_calib = true,
 +      .led_mode = IWL_LED_RF_STATE,
 +      .adv_pm = true,
        /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
        .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+       .use_new_eeprom_reading = true,
  };
  
 -struct iwl_cfg iwl6000g2b_2bgn_cfg = {
 -      .name = "6000 Series 2x2 BGN Gen2b",
 +struct iwl_cfg iwl6030_2bgn_cfg = {
 +      .name = "Intel(R) Centrino(R) Advanced-N 6230 BGN",
        .fw_name_pre = IWL6000G2B_FW_PRE,
        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
        .ht_params = &iwl6000_ht_params,
        .need_dc_calib = true,
        .need_temp_offset_calib = true,
 +      .led_mode = IWL_LED_RF_STATE,
 +      .adv_pm = true,
        /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
        .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+       .use_new_eeprom_reading = true,
  };
  
 -struct iwl_cfg iwl6000g2b_2bg_cfg = {
 -      .name = "6000 Series 2x2 BG Gen2b",
 +struct iwl_cfg iwl6030_2bg_cfg = {
 +      .name = "Intel(R) Centrino(R) Advanced-N 6230 BG",
        .fw_name_pre = IWL6000G2B_FW_PRE,
        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
        .bt_params = &iwl6000_bt_params,
        .need_dc_calib = true,
        .need_temp_offset_calib = true,
 +      .led_mode = IWL_LED_RF_STATE,
 +      .adv_pm = true,
        /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
        .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+       .use_new_eeprom_reading = true,
  };
  
 -struct iwl_cfg iwl6000g2b_bgn_cfg = {
 -      .name = "6000 Series 1x2 BGN Gen2b",
 +struct iwl_cfg iwl1030_bgn_cfg = {
 +      .name = "Intel(R) Centrino(R) Wireless-N 1030 BGN",
        .fw_name_pre = IWL6000G2B_FW_PRE,
        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
        .ht_params = &iwl6000_ht_params,
        .need_dc_calib = true,
        .need_temp_offset_calib = true,
 +      .led_mode = IWL_LED_RF_STATE,
 +      .adv_pm = true,
        /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
        .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+       .use_new_eeprom_reading = true,
  };
  
 -struct iwl_cfg iwl6000g2b_bg_cfg = {
 -      .name = "6000 Series 1x2 BG Gen2b",
 +struct iwl_cfg iwl1030_bg_cfg = {
 +      .name = "Intel(R) Centrino(R) Wireless-N 1030 BG",
        .fw_name_pre = IWL6000G2B_FW_PRE,
        .ucode_api_max = IWL6000G2_UCODE_API_MAX,
        .ucode_api_min = IWL6000G2_UCODE_API_MIN,
        .bt_params = &iwl6000_bt_params,
        .need_dc_calib = true,
        .need_temp_offset_calib = true,
 +      .led_mode = IWL_LED_RF_STATE,
 +      .adv_pm = true,
        /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
        .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+       .use_new_eeprom_reading = true,
  };
  
  /*
@@@ -792,7 -813,7 +801,8 @@@ struct iwl_cfg iwl6150_bgn_cfg = 
        .base_params = &iwl6050_base_params,
        .ht_params = &iwl6000_ht_params,
        .need_dc_calib = true,
 +      .led_mode = IWL_LED_RF_STATE,
+       .use_new_eeprom_reading = true,
  };
  
  struct iwl_cfg iwl6050_2abg_cfg = {
@@@ -837,10 -865,9 +847,11 @@@ struct iwl_cfg iwl130_bgn_cfg = 
        .bt_params = &iwl6000_bt_params,
        .ht_params = &iwl6000_ht_params,
        .need_dc_calib = true,
 +      .led_mode = IWL_LED_RF_STATE,
 +      .adv_pm = true,
        /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
        .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+       .use_new_eeprom_reading = true,
  };
  
  struct iwl_cfg iwl130_bg_cfg = {
        .base_params = &iwl6000_coex_base_params,
        .bt_params = &iwl6000_bt_params,
        .need_dc_calib = true,
 +      .led_mode = IWL_LED_RF_STATE,
 +      .adv_pm = true,
        /* Due to bluetooth, we transmit 2.4 GHz probes only on antenna A */
        .scan_tx_antennas[IEEE80211_BAND_2GHZ] = ANT_A,
+       .use_new_eeprom_reading = true,
  };
  
  MODULE_FIRMWARE(IWL6000_MODULE_FIRMWARE(IWL6000_UCODE_API_MAX));
index 568920ac982dcd66db3f91015fb19c7f5dcc0cd3,954ecc2c34c41f239dc1d24932d67be68aa741fa..9df33d6af8bb31f66f8c5273dc2e1e9b25697510
@@@ -410,8 -390,7 +410,9 @@@ struct iwl_cfg 
        const bool need_temp_offset_calib; /* if used set to true */
        u8 scan_rx_antennas[IEEE80211_NUM_BANDS];
        u8 scan_tx_antennas[IEEE80211_NUM_BANDS];
 +      enum iwl_led_mode led_mode;
 +      const bool adv_pm;
+       const bool use_new_eeprom_reading; /* temporary, remove later */
  };
  
  /***************************
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/core/sock.c
Simple merge
Simple merge
diff --cc net/ipv4/udp.c
Simple merge
Simple merge
Simple merge
diff --cc net/ipv6/udp.c
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/socket.c
Simple merge