kevin/linux
1
Fork 0
Code
aca361c1a0
linux/net
History
Linus Torvalds aca361c1a0 Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 
* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (45 commits)
  [PATCH] Restore channel setting after scan.
  [PATCH] hostap: Fix memory leak on PCI probe error path
  [PATCH] hostap: Remove dead code (duplicated idx != 0)
  [PATCH] hostap: Fix unlikely read overrun in CIS parsing
  [PATCH] hostap: Fix double free in prism2_config() error path
  [PATCH] hostap: Fix ap_add_sta() return value verification
  [PATCH] hostap: Fix hw reset after CMDCODE_ACCESS_WRITE timeout
  [PATCH] wireless/airo: cache wireless scans
  [PATCH] wireless/airo: define default MTU
  [PATCH] wireless/airo: clean up printk usage to print device name
  [PATCH] WE-20 for kernel 2.6.16
  [PATCH] softmac: remove function_enter()
  [PATCH] skge: version 1.5
  [PATCH] skge: compute available ring buffers
  [PATCH] skge: dont free skb until multi-part transmit complete
  [PATCH] skge: multicast statistics fix
  [PATCH] skge: rx_reuse called twice
  [PATCH] skge: dont use dev_alloc_skb for rx buffs
  [PATCH] skge: align receive buffers
  [PATCH] sky2: dont need to use dev_kfree_skb_any
  ...
2006-03-23 16:25:49 -08:00
..
802 [SNAP]: Remove leftover unused hdr variable 2006-03-20 22:45:37 -08:00
8021q [NET]: Replace skb_pull/skb_postpull_rcsum with skb_pull_rcsum 2006-03-20 22:43:56 -08:00
appletalk [PATCH] capable/capability.h (net/) 2006-01-11 18:42:14 -08:00
atm [NET]: sem2mutex part 2 2006-03-20 22:35:41 -08:00
ax25 [AX.25]: Fix potencial memory hole. 2006-03-19 13:20:06 -08:00
bluetooth [BLUETOOTH]: Return negative error constant 2006-03-21 23:53:16 -08:00
bridge [BRIDGE]: Remove duplicate const from is_link_local() argument type. 2006-03-20 23:00:56 -08:00
core Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6 2006-03-23 16:25:49 -08:00
dccp [DCCP] feat: Pass dccp_minisock ptr where only the minisock is used 2006-03-20 22:51:53 -08:00
decnet [DECNET]: net/decnet/dn_route.c: fix inconsequent NULL checking 2006-03-20 23:00:29 -08:00
econet [ECONET]: Use macro for spinlock_t definition. 2006-01-04 13:56:08 -08:00
ethernet [NET] ethernet: Fix first packet goes out with MAC 00:00:00:00:00:00 2006-02-23 16:18:01 -08:00
ieee80211 [PATCH] Restore channel setting after scan. 2006-03-23 16:18:47 -05:00
ipv4 [IPV4]: Add fib rule netlink notifications 2006-03-23 01:16:06 -08:00
ipv6 [IPV6]: ip6_xmit: remove unnecessary NULL ptr check 2006-03-23 01:17:25 -08:00
ipx [PATCH] capable/capability.h (net/) 2006-01-11 18:42:14 -08:00
irda [IRDA]: out of range array access 2006-02-09 16:59:48 -08:00
key [NET] sem2mutex: net/ 2006-03-20 22:33:17 -08:00
lapb [NET]: Kill skb->list 2005-08-29 15:31:14 -07:00
llc [LLC]: llc_mac_hdr_init const arguments 2006-03-20 22:59:36 -08:00
netfilter [NETFILTER]: Fix xt_policy address matching 2006-03-22 13:56:33 -08:00
netlink [NETLINK]: Add netlink_has_listeners for avoiding unneccessary event message generation 2006-03-20 18:52:01 -08:00
netrom [PATCH] capable/capability.h (net/) 2006-01-11 18:42:14 -08:00
packet [NET]: Fix some whitespace issues in af_packet.c 2006-01-23 16:28:02 -08:00
rose [PATCH] capable/capability.h (net/) 2006-01-11 18:42:14 -08:00
rxrpc [NET]: "signed long" -> "long" 2006-01-17 13:03:54 -08:00
sched [NET_SCHED]: cls_u32: remove unnecessary NULL-ptr check 2006-03-23 01:16:48 -08:00
sctp [NET]: Identation & other cleanups related to compat_[gs]etsockopt cset 2006-03-20 22:48:35 -08:00
sunrpc [NET]: sem2mutex part 2 2006-03-20 22:35:41 -08:00
tipc [TIPC]: Avoid compiler warning 2006-03-20 22:38:33 -08:00
unix [NET]: sem2mutex part 2 2006-03-20 22:35:41 -08:00
wanrouter [PATCH] capable/capability.h (net/) 2006-01-11 18:42:14 -08:00
x25 [X25]: dte facilities 32 64 ioctl conversion 2006-03-22 00:02:00 -08:00
xfrm [XFRM]: Fix aevent related crash 2006-03-20 22:40:54 -08:00
compat.c [NET]: socket timestamp 32 bit handler for 64 bit kernel 2006-03-21 23:59:39 -08:00
Kconfig Merge branch 'master' 2006-02-07 01:47:12 -05:00
Makefile [TIPC] Initial merge 2006-01-12 14:06:31 -08:00
nonet.c [NET]: Fix sock_init() return value. 2006-01-03 13:11:17 -08:00
socket.c [NET]: allow 32 bit socket ioctl in 64 bit kernel 2006-03-21 23:58:08 -08:00
sysctl_net.c [NET]: Fix "sysctl_net.c:36: error: 'core_table' undeclared here" 2005-10-03 14:16:34 -07:00
TUNABLE Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00