Commit Graph

91 Commits

Author SHA1 Message Date
Linus Torvalds
f9da455b93 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Pull networking updates from David Miller:

 1) Seccomp BPF filters can now be JIT'd, from Alexei Starovoitov.

 2) Multiqueue support in xen-netback and xen-netfront, from Andrew J
    Benniston.

 3) Allow tweaking of aggregation settings in cdc_ncm driver, from Bjørn
    Mork.

 4) BPF now has a "random" opcode, from Chema Gonzalez.

 5) Add more BPF documentation and improve test framework, from Daniel
    Borkmann.

 6) Support TCP fastopen over ipv6, from Daniel Lee.

 7) Add software TSO helper functions and use them to support software
    TSO in mvneta and mv643xx_eth drivers.  From Ezequiel Garcia.

 8) Support software TSO in fec driver too, from Nimrod Andy.

 9) Add Broadcom SYSTEMPORT driver, from Florian Fainelli.

10) Handle broadcasts more gracefully over macvlan when there are large
    numbers of interfaces configured, from Herbert Xu.

11) Allow more control over fwmark used for non-socket based responses,
    from Lorenzo Colitti.

12) Do TCP congestion window limiting based upon measurements, from Neal
    Cardwell.

13) Support busy polling in SCTP, from Neal Horman.

14) Allow RSS key to be configured via ethtool, from Venkata Duvvuru.

15) Bridge promisc mode handling improvements from Vlad Yasevich.

16) Don't use inetpeer entries to implement ID generation any more, it
    performs poorly, from Eric Dumazet.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1522 commits)
  rtnetlink: fix userspace API breakage for iproute2 < v3.9.0
  tcp: fixing TLP's FIN recovery
  net: fec: Add software TSO support
  net: fec: Add Scatter/gather support
  net: fec: Increase buffer descriptor entry number
  net: fec: Factorize feature setting
  net: fec: Enable IP header hardware checksum
  net: fec: Factorize the .xmit transmit function
  bridge: fix compile error when compiling without IPv6 support
  bridge: fix smatch warning / potential null pointer dereference
  via-rhine: fix full-duplex with autoneg disable
  bnx2x: Enlarge the dorq threshold for VFs
  bnx2x: Check for UNDI in uncommon branch
  bnx2x: Fix 1G-baseT link
  bnx2x: Fix link for KR with swapped polarity lane
  sctp: Fix sk_ack_backlog wrap-around problem
  net/core: Add VF link state control policy
  net/fsl: xgmac_mdio is dependent on OF_MDIO
  net/fsl: Make xgmac_mdio read error message useful
  net_sched: drr: warn when qdisc is not work conserving
  ...
2014-06-12 14:27:40 -07:00
Sachin Kamat
fe6d68f212 staging: rtl8821ae: stats.c: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:27 -07:00
Sachin Kamat
2b4b5a628c staging: rtl8821ae: trx.h: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:27 -07:00
Sachin Kamat
e7f5a21942 staging: rtl8821ae: trx.c: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:27 -07:00
Sachin Kamat
575e8dace0 staging: rtl8821ae: sw.c: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:27 -07:00
Sachin Kamat
0c288d454d staging: rtl8821ae: regd.h: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:27 -07:00
Sachin Kamat
b9ddcee903 staging: rtl8821ae: regd.c: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:26 -07:00
Sachin Kamat
756a748106 staging: rtl8821ae: rc.c: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:26 -07:00
Sachin Kamat
35722b4141 staging: rtl8821ae: ps.c: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:26 -07:00
Sachin Kamat
aa59f7a526 staging: rtl8821ae: pci.h: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:26 -07:00
Sachin Kamat
c6e8a9e8ef staging: rtl8821ae: pci.c: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:26 -07:00
Sachin Kamat
1939f350a2 staging: rtl8821ae: efuse.c: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:26 -07:00
Sachin Kamat
4874043a6c staging: rtl8821ae: debug.c: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:26 -07:00
Sachin Kamat
0cd05ba54a staging: rtl8821ae: core.c: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:25 -07:00
Sachin Kamat
479774008a staging: rtl8821ae: compat.h: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:25 -07:00
Sachin Kamat
80e3e09c0e staging: rtl8821ae: cam.c: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:25 -07:00
Sachin Kamat
8b292b0007 staging: rtl8821ae: base.c: Remove version specific code
The code should be for the current kernel version. Remove
conditional version based code.

Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-27 11:58:25 -07:00
Larry Finger
9c0b41d43d staging: r8821ae: Fix potential problem with rate control registration
The zero day testing facility reported a problem with duplicate
registration of the rate-control algorithm. Although not yet reported,
this driver needs the same fix.

Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-26 20:17:51 -07:00
Konrad Zapalowicz
83991567b1 staging: rtl8821ae: add static for local symbols in rtl_btc.c
This commit fixes the sparse warning:

    "warning: symbol 'X' was not declared. Should it be static?"

Where the X is one of the following

    rtl_btc_operation

Signed-off-by: Konrad Zapalowicz <bergo.torino@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-25 11:11:18 -07:00
Konrad Zapalowicz
45475dc312 staging: rtl8821ae: deal with unused functions in halbtcoutsrc.c
This commit fixes the compiler -Wunused-function warning. Several
functions had to be removed.

Removed symbols

    halbtc_is_hw_mailbox_exist
    halbtc_set_macreg
    halbtc_get_macreg
    halbtc_under_ips

Signed-off-by: Konrad Zapalowicz <bergo.torino@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-25 11:11:18 -07:00
Konrad Zapalowicz
0eec210abc staging: rtl8821ae: add static for local symbols in halbtcoutsrc.c
This commit fixes the sparse warning:

    "warning: symbol 'X' was not declared. Should it be static?"

Where the X is one of the following:

    bt_profile_string
    bt_spec_string
    bt_link_role_string
    h2c_state_string
    io_state_string
    btc_dbg_buf
    halbtc_is_bt_coexist_available
    halbtc_is_wifi_busy
    halbtc_dbg_init
    halbtc_is_hw_mailbox_exist
    halbtc_is_bt40
    halbtc_legacy
    halbtc_get_wifi_bw
    halbtc_get_wifi_central_chnl
    halbtc_leave_lps
    halbtc_enter_lps
    halbtc_normal_lps
    halbtc_leave_low_power
    halbtc_nomal_low_power
    halbtc_disable_low_power
    halbtc_aggregation_check
    halbtc_get_bt_patch_version
    halbtc_get_wifi_rssi
    halbtc_get
    halbtc_set
    halbtc_display_coex_statistics
    halbtc_display_bt_link_info
    halbtc_display_bt_fw_info
    halbtc_display_fw_pwr_mode_cmd
    halbtc_read_1byte
    halbtc_read_2byte
    halbtc_read_4byte
    halbtc_write_1byte
    halbtc_bitmask_write_1byte
    halbtc_write_2byte
    halbtc_write_4byte
    halbtc_set_macreg
    halbtc_get_macreg
    halbtc_set_bbreg
    halbtc_get_bbreg
    halbtc_set_rfreg
    halbtc_get_rfreg
    halbtc_fill_h2c_cmd
    halbtc_display_dbg_msg
    halbtc_under_ips

Signed-off-by: Konrad Zapalowicz <bergo.torino@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-25 11:11:18 -07:00
Konrad Zapalowicz
65aa61c036 staging: rtl8821ae: deal with unused functions in halbtc8723b2ant.c
This commit fixes the compiler -Wunused-function warning. It was enough
to put #define around them to supress this warning. One was a special
case because it's usage was commented-out therefore, as I did not want
to remove it completely, I disabled it with #if 0

Conditionally compiled symbols

    halbtc8723b2ant_monitor_bt_enable_disable
    halbtc8723b2ant_set_bt_auto_report
    halbtc8723b2ant_bt_auto_report

Disabled symbols

    halbtc8723b2ant_adc_backoff
    halbtc8723b2ant_set_adc_backoff

Signed-off-by: Konrad Zapalowicz <bergo.torino@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-25 11:11:18 -07:00
Konrad Zapalowicz
8b596f5993 staging: rtl8821ae: add static for local symbols in halbtc8723b2ant.c
This commit fixes the sparse warning:

    "warning: symbol 'X' was not declared. Should it be static?"

Where the X is one of the following:

    glbt_info_src_8723b_2ant
    glcoex_ver_date_8723b_2ant
    glcoex_ver_8723b_2ant
    halbtc8723b2ant_bt_rssi_state
    halbtc8723b2ant_wifi_rssi_state
    halbtc8723b2ant_monitor_bt_enable_disable
    halbtc8723b2ant_monitor_bt_ctr
    halbtc8723b2ant_query_bt_info
    halbtc8723b2ant_is_wifi_status_changed
    halbtc8723b2ant_update_bt_link_info
    halbtc8723b2ant_action_algorithm
    halbtc8723b2ant_need_to_dec_bt_pwr
    halbtc8723b2ant_set_fw_dac_swing_level
    halbtc8723b2ant_set_fw_dec_bt_pwr
    halbtc8723b2ant_dec_bt_pwr
    halbtc8723b2ant_set_bt_auto_report
    halbtc8723b2ant_bt_auto_report
    halbtc8723b2ant_fw_dac_swing_lvl
    halbtc8723b2ant_set_sw_rf_rx_lpf_corner
    halbtc8723b2ant_rf_shrink
    halbtc8723b2ant_set_sw_penalty_txrate_adaptive
    halbtc8723b2ant_low_penalty_ra
    halbtc8723b2ant_set_dac_swing_reg
    halbtc8723b2ant_set_sw_fulltime_dac_swing
    halbtc8723b2ant_dac_swing
    halbtc8723b2ant_set_adc_backoff
    halbtc8723b2ant_adc_backoff
    halbtc8723b2ant_set_agc_table
    halbtc8723b2ant_agc_table
    halbtc8723b2ant_set_coex_table
    halbtc8723b2ant_coex_table
    halbtc8723b2ant_coex_table_with_type
    halbtc8723b2ant_set_fw_ignore_wlan_act
    halbtc8723b2ant_ignore_wlan_act
    halbtc8723b2ant_set_fw_ps_tdma
    halbtc8723b2ant_sw_mechanism1
    halbtc8723b2ant_sw_mechanism2
    halbtc8723b2ant_set_ant_path
    halbtc8723b2ant_ps_tdma
    halbtc8723b2ant_coex_alloff
    halbtc8723b2ant_init_coex_dm
    halbtc8723b2ant_action_bt_inquiry
    halbtc8723b2ant_is_common_action
    halbtc8723b2ant_tdma_duration_adjust
    halbtc8723b2ant_action_sco
    halbtc8723b2ant_action_hid
    halbtc8723b2ant_action_a2dp
    halbtc8723b2ant_action_a2dp_pan_hs
    halbtc8723b2ant_action_pan_edr
    halbtc8723b2ant_action_pan_hs
    halbtc8723b2ant_action_pan_edr_a2dp
    halbtc8723b2ant_action_pan_edr_hid
    halbtc8723b2ant_action_hid_a2dp_pan_edr
    halbtc8723b2ant_action_hid_a2dp
    halbtc8723b2ant_run_coexist_mechanism
    halbtc8723b2ant_wifioff_hwcfg

Signed-off-by: Konrad Zapalowicz <bergo.torino@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-25 11:11:18 -07:00
Konrad Zapalowicz
f2591796b8 staging: rtl8821ae: deal with unused functions in halbtc8723b1ant.c
This commit fixes the compiler -Wunused-function warning. Most of the
unused functions were removed however for a few of them it was enough
to put #define around them.

Removed symbols:

    halbtc8723b1ant_rf_shrink
    halbtc8723b1ant_dac_swing
    halbtc8723b1ant_adc_backoff
    halbtc8723b1ant_agc_table
    halbtc8723b1ant_coex_alloff
    halbtc8723b1ant_ps_tdma_type_by_wifi_rssi
    halbtc8723b1ant_set_sw_rf_rx_lpf_corner
    halbtc8723b1ant_set_sw_full_time_dac_swing
    halbtc8723b1ant_set_adc_backoff
    halbtc8723b1ant_set_agc_table
    halbtc8723b1ant_set_dac_swing_reg

Conditionally compiled symbols:

    halbtc8723b1ant_bt_auto_report
    halbtc8723b1ant_set_bt_auto_report
    halbtc8723b1ant_action_wifi_only
    halbtc8723b1ant_monitor_bt_enable_disable

Signed-off-by: Konrad Zapalowicz <bergo.torino@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-25 11:11:17 -07:00
Konrad Zapalowicz
e9329bd3dd staging: rtl8821ae: add static for local symbols in halbtc8723b1ant.c
This commit fixes the sparse warning:

    "warning: symbol 'X' was not declared. Should it be static?"

Where the X is one of the following:

    glbt_info_src_8723b_2ant
    glcoex_ver_date_8723b_2ant
    glcoex_ver_8723b_2ant
    halbtc8723b2ant_bt_rssi_state
    halbtc8723b2ant_wifi_rssi_state
    halbtc8723b2ant_monitor_bt_enable_disable
    halbtc8723b2ant_monitor_bt_ctr
    halbtc8723b2ant_query_bt_info
    halbtc8723b2ant_is_wifi_status_changed
    halbtc8723b2ant_update_bt_link_info
    halbtc8723b2ant_action_algorithm
    halbtc8723b2ant_need_to_dec_bt_pwr
    halbtc8723b2ant_set_fw_dac_swing_level
    halbtc8723b2ant_set_fw_dec_bt_pwr
    halbtc8723b2ant_dec_bt_pwr
    halbtc8723b2ant_set_bt_auto_report
    halbtc8723b2ant_bt_auto_report
    halbtc8723b2ant_fw_dac_swing_lvl
    halbtc8723b2ant_set_sw_rf_rx_lpf_corner
    halbtc8723b2ant_rf_shrink
    halbtc8723b2ant_set_sw_penalty_txrate_adaptive
    halbtc8723b2ant_low_penalty_ra
    halbtc8723b2ant_set_dac_swing_reg
    halbtc8723b2ant_set_sw_fulltime_dac_swing
    halbtc8723b2ant_dac_swing
    halbtc8723b2ant_set_adc_backoff
    halbtc8723b2ant_adc_backoff
    halbtc8723b2ant_set_agc_table
    halbtc8723b2ant_agc_table
    halbtc8723b2ant_set_coex_table
    halbtc8723b2ant_coex_table
    halbtc8723b2ant_coex_table_with_type
    halbtc8723b2ant_set_fw_ignore_wlan_act
    halbtc8723b2ant_ignore_wlan_act
    halbtc8723b2ant_set_fw_ps_tdma
    halbtc8723b2ant_sw_mechanism1
    halbtc8723b2ant_sw_mechanism2
    halbtc8723b2ant_set_ant_path
    halbtc8723b2ant_ps_tdma
    halbtc8723b2ant_coex_alloff
    halbtc8723b2ant_init_coex_dm
    halbtc8723b2ant_action_bt_inquiry
    halbtc8723b2ant_is_common_action
    halbtc8723b2ant_tdma_duration_adjust
    halbtc8723b2ant_action_sco
    halbtc8723b2ant_action_hid
    halbtc8723b2ant_action_a2dp
    halbtc8723b2ant_action_a2dp_pan_hs
    halbtc8723b2ant_action_pan_edr
    halbtc8723b2ant_action_pan_hs
    halbtc8723b2ant_action_pan_edr_a2dp
    halbtc8723b2ant_action_pan_edr_hid
    halbtc8723b2ant_action_hid_a2dp_pan_edr
    halbtc8723b2ant_action_hid_a2dp
    halbtc8723b2ant_run_coexist_mechanism
    halbtc8723b2ant_wifioff_hwcfg

Signed-off-by: Konrad Zapalowicz <bergo.torino@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-25 11:11:17 -07:00
Kees Cook
6fdb1f4fb0 staging/rtl8821ae: avoid format string leak to thread name
This makes sure the cfg->name can never accidentally be processed as a
format string in the worker thread name.

Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-23 21:33:51 +09:00
Konrad Zapalowicz
4b9708e0c6 staging: rtl8821ae: fix not declared symbols should be static in sw.c
This commit fixes the following sparse warnings:

drivers/staging/rtl8821ae/rtl8821ae/sw.c:
    - 48:6: warning: symbol 'rtl8821ae_init_aspm_vars' was not declared.
      Should it be static?
    - 228:5: warning: symbol 'rtl8812ae_rx_command_packet_handler' was
      not declared. Should it be static?
    - 263:20: warning: symbol 'rtl8821ae_hal_ops' was not declared.
      Should it be static?
    - 314:23: warning: symbol 'rtl8821ae_mod_params' was not declared.
      Should it be static?
    - 321:20: warning: symbol 'rtl8821ae_hal_cfg' was not declared.
      Should it be static?

All of this symbols are local, that is there are no references to them
in the other files from this driver.

Signed-off-by: Konrad Zapalowicz <bergo.torino@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-23 21:33:50 +09:00
Konrad Zapalowicz
1abc4ef449 staging: rtl8821ae: fix double const in sw.c
This commit fixes the following sparse warning:

drivers/staging/rtl8821ae/rtl8821ae/sw.c:
    - 449:14: warning: duplicate const

Signed-off-by: Konrad Zapalowicz <bergo.torino@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-23 21:33:50 +09:00
Levente Kurusa
138d7d0340 staging: rtl8821ae: fix pointer coding style
Found by checkpatch.

Signed-off-by: Levente Kurusa <levex@linux.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-23 21:32:28 +09:00
Jan Moskyto Matejka
b9fb433072 rtl8821ae: fixed defined-not-used warning
by cleaning up BT_AUTO_REPORT_ONLY_8192E_2ANT
(always set to 0, never used as constant)

halbtc8192e2ant_iswifi_status_changed was called only from the unused code

Signed-off-by: Jan Moskyto Matejka <mq@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-05-03 20:24:27 -04:00
John W. Linville
406a94d7fa Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2014-05-02 13:47:50 -04:00
Anders Darander
4ada11147e staging/rtl8821ae: fix sparse address space warning
Change the definition of pci_mem_start|end from correct from pci_io(un)map's
point of view.

Signed-off-by: Anders Darander <anders.darander@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-25 16:02:01 -07:00
Mark Einon
5332a5e0fa staging: rtl8821ae: don't initialise statics to 0 or NULL in halbtc8192e2ant.c
Fixes all checkpatch errors reporting that statics shouldn't be initialised
to their defualt values.

Signed-off-by: Mark Einon <mark@einon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-25 15:47:34 -07:00
Mark Einon
7801e8d67f staging: rtl8821ae: Fix indetentation of switch case statements
Fixes checkpatch error:

ERROR: switch and case should be at the same indent
+               switch (coex_dm->cur_retrylimit_type) {
+                       case 0: /* normal mode */
[...]
+                       case 1: /* retry limit=8 */
[...]
+                       default:

Signed-off-by: Mark Einon <mark@einon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-25 15:47:34 -07:00
Mark Einon
a668d5d575 staging: rtl8821ae: halbtc8192e2ant.c fix checkpatch leading spaces/tabs issues
Fix checkpatch issues relating to using leading spaces instead of tabs.
Whitespace changes only.

Signed-off-by: Mark Einon <mark@einon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-25 15:47:34 -07:00
Mark Einon
7d753415d8 staging: rtl8821ae: Fix checkpatch whitespace issues
Whitespace changes only to appease checkpatch warnings.

Signed-off-by: Mark Einon <mark@einon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-25 15:47:33 -07:00
Mark Einon
6149647db3 staging: rtl8821ae: Remove declaration assignment to zero
We set btrssi to zero and then immediately assign it. Assign it
on declaration instead.

Signed-off-by: Mark Einon <mark@einon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-25 15:47:33 -07:00
Mark Einon
09c6e8794f staging: rtl8821ae: Fix halbtc8192e2ant.c 'defined but not used' sparse warnings
Sparse complains about halbtc8192e2ant_low_penalty_ra() not being used,
and subsequently halbtc8192e2ant_set_sw_penalty_tx_rateadaptive() when
this is removed. remove both functions.

Signed-off-by: Mark Einon <mark@einon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-25 15:47:33 -07:00
Mark Einon
35c9e7fd57 staging: rtl8821ae: Fix halbtc8192e2ant.c 'should it be static?' sparse warnings
In halbtc8192e2ant.c, fix all instances of the sparse warning:

warning: symbol 'xxx' was not declared. Should it be static?

Signed-off-by: Mark Einon <mark@einon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-25 15:47:33 -07:00
Mark Einon
88a6733980 staging: rtl8821ae: Remove unused functions
Remove functions not being called from anywhere:

halbtc8192e2ant_set_adc_backoff()
halbtc8192e2ant_adc_backoff()

Signed-off-by: Mark Einon <mark@einon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-25 15:47:33 -07:00
Mark Einon
6d09e0efef staging: rtl8821ae: Remove file #if 1
All code in this file is encapsulated in a useless #if 1
declaration, remove it.

Signed-off-by: Mark Einon <mark@einon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-25 15:47:33 -07:00
Greg Kroah-Hartman
3eb9992caf Merge 3.15-rc2 into staging-next
This resolves a bunch of merge errors with other fixes that are already
in Linus's tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-22 10:08:40 -07:00
Richard Weinberger
29d1e7209e staging/rtl8821ae: Fix OOM handling in _rtl_init_deferred_work()
alloc_workqueue() can fail, handle this case.

Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-15 11:39:09 -07:00
Mark Einon
bd2715f6e7 staging: rtl8821ae: Fix rtl8821ae/hw.h pointer declaration style
Fix all occurences of the checkpatch error:

ERROR: "foo* bar" should be "foo *bar"

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-14 08:29:30 -07:00
Mark Einon
f6d49cb0ff staging: rtl8821ae: Remove FSF mailing address from rtl8821ae/hw.h header
Fix checkpatch check:

CHECK: Do not include the paragraph about writing to the Free Software
Foundation's mailing address from the sample GPL notice. The FSF has
changed addresses in the past, and may do so again. Linux already
includes a copy of the GPL.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-14 08:29:30 -07:00
Mark Einon
dab3775c6c staging: rtl8821ae: Fix whitespace in rtl8821ae/hw.h
Fix checkpatch warnings, lines over 80 chars using tabs where possible.

Signed-off-by: Mark Einon <mark.einon@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-04-14 08:29:30 -07:00
Emmanuel Grumbach
77be2c54c5 mac80211: add vif to flush call
This will allow the low level driver to make decision based
on the vif such as queues etc...
Since the vif might be NULL, we can't add it to the tracing
functions.

Signed-off-by: Emmanuel Grumbach <emmanuel.grumbach@intel.com>
[fix staging rtl8821ae driver]
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
2014-04-09 10:55:29 +02:00
Linus Torvalds
cd6362befe Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
Pull networking updates from David Miller:
 "Here is my initial pull request for the networking subsystem during
  this merge window:

   1) Support for ESN in AH (RFC 4302) from Fan Du.

   2) Add full kernel doc for ethtool command structures, from Ben
      Hutchings.

   3) Add BCM7xxx PHY driver, from Florian Fainelli.

   4) Export computed TCP rate information in netlink socket dumps, from
      Eric Dumazet.

   5) Allow IPSEC SA to be dumped partially using a filter, from Nicolas
      Dichtel.

   6) Convert many drivers to pci_enable_msix_range(), from Alexander
      Gordeev.

   7) Record SKB timestamps more efficiently, from Eric Dumazet.

   8) Switch to microsecond resolution for TCP round trip times, also
      from Eric Dumazet.

   9) Clean up and fix 6lowpan fragmentation handling by making use of
      the existing inet_frag api for it's implementation.

  10) Add TX grant mapping to xen-netback driver, from Zoltan Kiss.

  11) Auto size SKB lengths when composing netlink messages based upon
      past message sizes used, from Eric Dumazet.

  12) qdisc dumps can take a long time, add a cond_resched(), From Eric
      Dumazet.

  13) Sanitize netpoll core and drivers wrt.  SKB handling semantics.
      Get rid of never-used-in-tree netpoll RX handling.  From Eric W
      Biederman.

  14) Support inter-address-family and namespace changing in VTI tunnel
      driver(s).  From Steffen Klassert.

  15) Add Altera TSE driver, from Vince Bridgers.

  16) Optimizing csum_replace2() so that it doesn't adjust the checksum
      by checksumming the entire header, from Eric Dumazet.

  17) Expand BPF internal implementation for faster interpreting, more
      direct translations into JIT'd code, and much cleaner uses of BPF
      filtering in non-socket ocntexts.  From Daniel Borkmann and Alexei
      Starovoitov"

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1976 commits)
  netpoll: Use skb_irq_freeable to make zap_completion_queue safe.
  net: Add a test to see if a skb is freeable in irq context
  qlcnic: Fix build failure due to undefined reference to `vxlan_get_rx_port'
  net: ptp: move PTP classifier in its own file
  net: sxgbe: make "core_ops" static
  net: sxgbe: fix logical vs bitwise operation
  net: sxgbe: sxgbe_mdio_register() frees the bus
  Call efx_set_channels() before efx->type->dimension_resources()
  xen-netback: disable rogue vif in kthread context
  net/mlx4: Set proper build dependancy with vxlan
  be2net: fix build dependency on VxLAN
  mac802154: make csma/cca parameters per-wpan
  mac802154: allow only one WPAN to be up at any given time
  net: filter: minor: fix kdoc in __sk_run_filter
  netlink: don't compare the nul-termination in nla_strcmp
  can: c_can: Avoid led toggling for every packet.
  can: c_can: Simplify TX interrupt cleanup
  can: c_can: Store dlc private
  can: c_can: Reduce register access
  can: c_can: Make the code readable
  ...
2014-04-02 20:53:45 -07:00
Gulsah Kose
0d89475861 staging: rtl8821ae: Fix braces {} are not necessary.
Fix checkpatch.pl issues with braces {} are not necessary in base.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:14:58 -07:00
Gulsah Kose
66d8a3938e staging: rtl8821ae: Fix suspect code indent for conditional statements
Fix checkpatch.pl issues with suspect code indent for conditional
statements (16, 16) in base.c

Signed-off-by: Gulsah Kose <gulsah.1004@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-03-19 09:14:58 -07:00