Johannes Berg 3f9768a5d2 mac80211: fix association beacon wait timeout ...

The TU_TO_EXP_TIME() macro already includes the
"jiffies +" piece of the calculation, so don't
add jiffies again.

Reported-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Tested-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>

2012-04-09 15:54:46 -04:00

..

9p

net/9p: handle flushed Tclunk/Tremove

2012-02-26 14:49:57 -06:00

802

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

2012-04-02 17:53:39 -07:00

8021q

…

appletalk

…

atm

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ax25

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

batman-adv

Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge

2012-03-11 15:36:34 -07:00

bluetooth

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

2012-04-09 15:47:49 -04:00

bridge

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

2012-03-09 14:34:20 -08:00

caif

caif: make zero a legal caif connetion id.

2012-03-11 15:38:16 -07:00

can

…

ceph

libceph: isolate kmap() call in write_partial_msg_pages()

2012-03-22 10:47:52 -05:00

core

net: fix a race in sock_queue_err_skb()

2012-04-06 05:07:21 -04:00

dcb

…

dccp

dccp: fix bug in sequence number validation during connection setup

2012-03-03 09:02:52 -07:00

decnet

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

dns_resolver

KEYS: Allow special keyrings to be cleared

2012-01-19 14:38:51 +11:00

dsa

…

econet

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ethernet

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

ieee802154

net/ieee802154/6lowpan.c: reuse eth_mac_addr()

2012-02-22 14:46:37 -05:00

ipv4

tcp: tcp_sendpages() should call tcp_push() once

2012-04-05 19:04:27 -04:00

ipv6

ipv6: fix array index in ip6_mc_add_src()

2012-04-05 00:00:42 -04:00

ipx

…

irda

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

iucv

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

2012-03-22 18:15:32 -07:00

key

…

l2tp

l2tp: enable automatic module loading for l2tp_ppp

2012-03-21 22:14:56 -04:00

lapb

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

llc

llc: Fix race condition in llc_ui_recvmsg

2012-01-24 15:33:19 -05:00

mac80211

mac80211: fix association beacon wait timeout

2012-04-09 15:54:46 -04:00

netfilter

netfilter: nf_conntrack: fix count leak in error path of __nf_conntrack_alloc

2012-04-03 19:20:30 -04:00

netlabel

netlabel: use GFP flags from caller instead of GFP_ATOMIC

2012-03-22 19:29:57 -04:00

netlink

netlink: fix races after skb queueing

2012-04-06 04:21:06 -04:00

netrom

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

nfc

NFC: NCI code identation fixes

2012-03-06 15:16:25 -05:00

openvswitch

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

packet

Remove all #inclusions of asm/system.h

2012-03-28 18:30:03 +01:00

phonet

phonet: Check input from user before allocating

2012-04-05 19:05:56 -04:00

rds

RDS: use gfp flags from caller in conn_alloc()

2012-03-22 19:29:58 -04:00

rfkill

device.h: cleanup users outside of linux/include (C files)

2012-03-11 14:27:37 -04:00

rose

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

2012-04-02 17:53:39 -07:00

rxrpc

RxRPC: Fix kcalloc parameters swapped

2012-02-14 14:41:55 -05:00

sched

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

2012-03-20 21:04:47 -07:00

sctp

sctp: Allow struct sctp_event_subscribe to grow without breaking binaries

2012-04-04 18:05:02 -04:00

sunrpc

Merge branch 'for-3.4' of git://linux-nfs.org/~bfields/linux

2012-03-29 14:53:25 -07:00

tipc

tipc: Optimize setting of immutable payload message header fields

2012-02-29 11:45:35 -05:00

unix

poll: add poll_requested_events() and poll_does_not_wait() functions

2012-03-23 16:58:38 -07:00

wanrouter

…

wimax

…

wireless

Merge branch 'akpm' (Andrew's patch-bomb)

2012-04-05 15:30:34 -07:00

x25

…

xfrm

xfrm: Access the replay notify functions via the registered callbacks

2012-03-22 19:29:58 -04:00

compat.c

Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

2012-03-29 18:12:23 -07:00

Kconfig

…

Makefile

…

nonet.c

…

socket.c

tcp: tcp_sendpages() should call tcp_push() once

2012-04-05 19:04:27 -04:00

sysctl_net.c

sysctl: Modify __register_sysctl_paths to take a set instead of a root and an nsproxy

2012-01-24 16:40:30 -08:00