BackPup/Linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-09-23 14:54:20 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

Browse Source 
Conflicts:

	net/mac80211/mlme.c
This commit is contained in:
David S. Miller
2008-09-08 16:59:05 -07:00
parent 712d6954e3 82a28c794f
commit 17dce5dfe3
1036 changed files with 34407 additions and 11129 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/net/inet_timewait_sock.h
View File

@@ -208,6 +208,9 @@ extern void inet_twsk_schedule(struct inet_timewait_sock *tw,
extern void inet_twsk_deschedule(struct inet_timewait_sock *tw,
struct inet_timewait_death_row *twdr);
extern void inet_twsk_purge(struct net *net, struct inet_hashinfo *hashinfo,
struct inet_timewait_death_row *twdr, int family);
static inline
struct net *twsk_net(const struct inet_timewait_sock *twsk)
{