summaryrefslogtreecommitdiff
path: root/net/ipv4/tcp_dctcp.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2015-06-10 22:49:49 -0700
committerDavid S. Miller <davem@davemloft.net>2015-06-10 22:49:49 -0700
commit1edaa7e8a7e753bd42d795bf289a6488aeae7f56 (patch)
treeecd7a95b747104cd797bdc5be1a3e7258e2d77c8 /net/ipv4/tcp_dctcp.c
parent37a9a8df8ce9de6ea73349c9ac8bdf6ba4ec4f70 (diff)
parent30686bf7f5b3c30831761e188a6e3cb33580fa48 (diff)
Merge tag 'mac80211-next-for-davem-2015-06-10' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Johannes Berg says: ==================== For this round we mostly have fixes: * mesh fixes from Alexis Green and Chun-Yeow Yeoh, * a documentation fix from Jakub Kicinski, * a missing channel release (from Michal Kazior), * a fix for a signal strength reporting bug (from Sara Sharon), * handle deauth while associating (myself), * don't report mangled TX SKB back to userspace for status (myself), * handle aggregation session timeouts properly in fast-xmit (myself) However, there are also a few cleanups and one big change that affects all drivers (and that required me to pull in your tree) to change the mac80211 HW flags to use an unsigned long bitmap so that we can extend them more easily - we're running out of flags even with a cleanup to remove the two unused ones. ==================== Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_dctcp.c')
0 files changed, 0 insertions, 0 deletions