korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-03 09:04:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
99ee038d41
linux/net/ieee802154
History
David S. Miller 04c9f416e3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	net/batman-adv/bridge_loop_avoidance.c
	net/batman-adv/bridge_loop_avoidance.h
	net/batman-adv/soft-interface.c
	net/mac80211/mlme.c

With merge help from Antonio Quartulli (batman-adv) and
Stephen Rothwell (drivers/net/usb/qmi_wwan.c).

The net/mac80211/mlme.c conflict seemed easy enough, accounting for a
conversion to some new tracing macros.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-07-10 23:56:33 -07:00
..
6lowpan.c 6lowpan: revert 'reuse eth_mac_addr()' 2012-07-05 03:11:15 -07:00
6lowpan.h 6lowpan: duplicate definition of IEEE802154_ALEN 2012-04-26 06:01:09 -04:00
af802154.h net: add IEEE 802.15.4 socket family implementation 2009-06-09 05:25:32 -07:00
af_ieee802154.c ieee802154: free skb buffer if dev isn't running 2011-06-30 16:18:09 +04:00
dgram.c ieee802154: verify packet size before trying to allocate it 2012-07-08 23:49:30 -07:00
ieee802154.h ieee802154: add two nl802154 helpers 2009-11-06 14:32:21 +03:00
Kconfig IEEE802.15.4: 6LoWPAN basic support 2011-08-24 19:36:06 -07:00
Makefile IEEE802.15.4: 6LoWPAN basic support 2011-08-24 19:36:06 -07:00
netlink.c net: Use NLMSG_DEFAULT_SIZE in combination with nlmsg_new() 2012-06-28 17:56:43 -07:00
nl_policy.c ieee802154: add LIST_PHY command support 2009-11-06 14:31:22 +03:00
nl-mac.c net: Use NLMSG_DEFAULT_SIZE in combination with nlmsg_new() 2012-06-28 17:56:43 -07:00
nl-phy.c net: Use NLMSG_DEFAULT_SIZE in combination with nlmsg_new() 2012-06-28 17:56:43 -07:00
raw.c net: cleanup unsigned to unsigned int 2012-04-15 12:44:40 -04:00
wpan-class.c ieee802154: Fix possible NULL pointer dereference in wpan_phy_alloc 2010-05-23 23:11:07 -07:00