David S. Miller 9f6d98c298 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c

The bnx2x gso_type setting bug fix in 'net' conflicted with
changes in 'net-next' that broke the gso_* setting logic
out into a seperate function, which also fixes the bug in
question.  Thus, use the 'net-next' version.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-02-12 18:58:28 -05:00

..

aes_ccm.c

mac80211: use AES_BLOCK_SIZE

2011-07-08 11:11:24 -04:00

aes_ccm.h

mac80211: use AES_BLOCK_SIZE

2011-07-08 11:11:24 -04:00

aes_cmac.c

mac80211: include export.h in aes_cmac

2012-11-07 18:01:54 +01:00

aes_cmac.h

mac80211: fix CMAC races

2011-07-08 11:11:20 -04:00

agg-rx.c

mac80211: improve aggregation debug messages

2013-01-18 21:55:15 +01:00

agg-tx.c

mac80211: fix aggregation state with current drivers

2013-01-24 15:43:51 +01:00

cfg.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-02-12 18:58:28 -05:00

cfg.h

[MAC80211]: rename ieee80211_cfg.h to cfg.h

2007-10-10 16:52:34 -07:00

chan.c

mac80211: fix channel context iteration

2013-01-03 13:01:35 +01:00

debug.h

mac80211: trace debug messages

2012-06-24 11:33:18 +02:00

debugfs_key.c

mac80211: add debug file for mic failure

2012-12-05 09:44:41 +01:00

debugfs_key.h

mac80211: support separate default keys

2010-12-13 15:23:29 -05:00

debugfs_netdev.c

mac80211: convert to channel definition struct

2012-11-26 12:42:59 +01:00

debugfs_netdev.h

mac80211: reduce reliance on netdev

2009-12-21 18:38:52 -05:00

debugfs_sta.c

net: remove obsolete simple_strto<foo>

2012-12-11 12:49:53 -05:00

debugfs_sta.h

mac80211: RCU-ify STA info structure access

2008-03-06 15:30:46 -05:00

debugfs.c

mac80211: make reset debugfs depend on CONFIG_PM

2012-09-19 08:20:24 +02:00

debugfs.h

mac80211: use __printf attribute in debugfs

2012-10-18 09:01:57 +02:00

driver-ops.h

mac80211: support mesh rate updates

2013-01-24 16:03:52 +01:00

event.c

cfg80211: use proper allocation flags

2009-07-10 15:01:49 -04:00

ht.c

mac80211: unset peer's HT 40 MHz support if not usable

2013-01-03 13:01:45 +01:00

ibss.c

mac80211: track enable_beacon explicitly

2013-01-03 13:01:35 +01:00

ieee80211_i.h

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2013-01-30 14:22:19 -05:00

iface.c

mac80211: remove ARP filter enable/disable logic

2013-01-18 21:20:34 +01:00

Kconfig

mac80211: fix copy-paste typo in Kconfig

2012-10-18 09:10:28 +02:00

key.c

mac80211: add op to configure default key id

2013-01-18 13:30:21 +01:00

key.h

mac80211: add debug file for mic failure

2012-12-05 09:44:41 +01:00

led.c

leds: Rename led_brightness_set() to led_set_brightness()

2012-07-24 07:52:34 +08:00

led.h

mac80211: selective throughput LED trigger active

2010-12-22 14:33:37 -05:00

main.c

mac80211: allow drivers to access IPv6 information

2013-01-18 21:55:38 +01:00

Makefile

mac80211: VHT peer STA caps

2012-10-17 11:02:14 +02:00

mesh_hwmp.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2013-01-28 13:54:03 -05:00

mesh_pathtbl.c

mac80211: clean up mpath_move_to_queue()

2012-08-20 13:25:05 +02:00

mesh_plink.c

mac80211: fix mesh_sta_info_get() reshuffle damage

2013-01-28 13:15:34 +01:00

mesh_sync.c

mac80211: fix for mesh sync to indicate TBTT adjustment

2012-11-30 12:41:46 +01:00

mesh.c

{cfg,nl,mac}80211: set beacon interval and DTIM period on mesh join

2013-01-16 22:44:04 +01:00

mesh.h

{cfg,nl,mac}80211: set beacon interval and DTIM period on mesh join

2013-01-16 22:44:04 +01:00

michael.c

mac80211: remove ieee80211_get_hdr_info

2008-07-08 14:16:01 -04:00

michael.h

mac80211: remove ieee80211_get_hdr_info

2008-07-08 14:16:01 -04:00

mlme.c

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-02-12 18:58:28 -05:00

offchannel.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2013-01-28 13:54:03 -05:00

pm.c

mac80211: split aggregation stop by reason

2013-01-03 13:01:41 +01:00

rate.c

mac80211: convert to channel definition struct

2012-11-26 12:42:59 +01:00

rate.h

mac80211: convert to channel definition struct

2012-11-26 12:42:59 +01:00

rc80211_minstrel_debugfs.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

rc80211_minstrel_ht_debugfs.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

rc80211_minstrel_ht.c

mac80211: simplify loop in minstrel_ht

2012-11-30 13:45:38 +01:00

rc80211_minstrel_ht.h

minstrel_ht: move minstrel_mcs_groups declaration to header file

2010-06-24 15:42:18 -04:00

rc80211_minstrel.c

minstrel: update stats after processing status

2012-12-10 22:51:50 +01:00

rc80211_minstrel.h

minstrel_ht: fixed rate mode through debugfs

2011-06-01 15:12:29 -04:00

rc80211_pid_algo.c

net: fix assignment of 0/1 to bool variables.

2011-12-19 22:27:29 -05:00

rc80211_pid_debugfs.c

net: Add export.h for EXPORT_SYMBOL/THIS_MODULE to non-modules

2011-10-31 19:30:30 -04:00

rc80211_pid.h

Fix common misspellings

2011-03-31 11:26:23 -03:00

rx.c

mac80211: support HT notify channel width action

2013-01-03 13:01:44 +01:00

scan.c

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

2013-01-28 13:54:03 -05:00

spectmgmt.c

mac80211: Remove unnecessary OOM logging messages

2011-09-13 15:45:02 -04:00

sta_info.c

mac80211: clean up mesh sta allocation warning

2013-01-24 16:03:34 +01:00

sta_info.h

mac80211: split aggregation stop by reason

2013-01-03 13:01:41 +01:00

status.c

Merge branch 'for-john' of git://git.sipsolutions.net/mac80211-next

2012-12-11 16:04:03 -05:00

tkip.c

mac80211: remove TKIP debug

2012-06-22 11:26:58 +02:00

tkip.h

mac80211: fix TKIP races, make API easier to use

2011-07-08 11:11:19 -04:00

trace.c

mac80211: trace debug messages

2012-06-24 11:33:18 +02:00

trace.h

mac80211: provide the vif in rssi_callback

2013-01-24 15:41:29 +01:00

tx.c

Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next

2013-01-30 14:22:19 -05:00

util.c

mac80211: call restart complete at wowlan resume time

2013-01-16 15:19:01 +01:00

vht.c

mac80211: VHT peer STA caps

2012-10-17 11:02:14 +02:00

wep.c

mac80211: fix network header location when adding encryption headers

2012-05-16 12:47:43 -04:00

wep.h

mac80211: move RX WEP weak IV counting

2012-03-13 14:54:16 -04:00

wme.c

mac80211: refactor ieee80211_set_qos_hdr

2012-11-26 11:36:02 +01:00

wme.h

mac80211: save wmm_acm per sdata

2012-06-20 17:35:22 +02:00

wpa.c

mac80211: add debug file for mic failure

2012-12-05 09:44:41 +01:00

wpa.h

mac80211: fix tx->skb NULL pointer dereference

2012-01-16 15:01:16 -05:00