Linus Torvalds
8d9ea7172e
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...
Pull networking fixes from David Miller:
"A pile of fixes in response to yesterday's big merge. The SCTP HMAC
thing hasn't been addressed yet, I'll take care of that myself if Neil
and Vlad don't show signs of life by tomorrow.
1) Use after free of SKB in tuntap code. Fix by Eric Dumazet,
reported by Dave Jones.
2) NFC LLCP code emits annoying kernel log message, triggerable by
the user. From Dave Jones.
3) Fix several endianness bugs noticed by sparse in the bridging
code, from Stephen Hemminger.
4) Ipv6 NDISC code doesn't take padding into account properly, fix
from YOSHIFUJI Hideaki.
5) Add missing docs to ethtool_flow_ext struct, from Yan Burman."
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
bridge: fix icmpv6 endian bug and other sparse warnings
net: ethool: Document struct ethtool_flow_ext
ndisc: Fix padding error in link-layer address option.
tuntap: dont use skb after netif_rx_ni(skb)
nfc: remove noisy message from llcp_sock_sendmsg
2012-12-13 13:20:02 -08:00
net: Use PTR_RET rather than if(IS_ERR(.. [1]
2012-08-06 13:30:02 -07:00
ARCNET: remove __dev* attributes
2012-12-03 11:16:10 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2012-12-13 12:00:02 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-12-12 18:07:07 -08:00
cris: fix eth_v10.c build error
2012-08-03 20:32:31 -07:00
dsa: Hide core config options; make drivers select what they need
2012-11-26 17:10:44 -05:00
PCI changes for the v3.8 merge window:
2012-12-13 12:14:47 -08:00
drivers/net: fix up function prototypes after __dev* removals
2012-12-07 14:22:22 -05:00
sections: fix section conflicts in drivers/net/hamradio
2012-10-06 03:04:43 +09:00
drivers/net: fix up function prototypes after __dev* removals
2012-12-07 14:22:22 -05:00
hyperv: Add an error message to rndis_filter_set_device_mac()
2012-11-30 15:02:56 -05:00
ieee802154: remove __dev* attributes
2012-12-03 11:16:56 -08:00
drivers/net: fix up function prototypes after __dev* removals
2012-12-07 14:22:22 -05:00
net: phy: smsc: Fix config_init typo
2012-12-07 14:26:15 -05:00
ppp: make ppp_get_stats64 static
2012-11-01 12:38:31 -04:00
team: fix hw_features setup
2012-11-28 11:39:22 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-12-12 18:07:07 -08:00
vmxnet3: remove __dev* attributes
2012-12-03 11:17:06 -08:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-12-12 18:07:07 -08:00
Merge branch 'master' into for-next
2012-10-28 19:29:19 +01:00
PCI changes for the v3.8 merge window:
2012-12-13 12:14:47 -08:00
xen: netback: handle compound page fragments on transmit.
2012-10-10 22:50:45 -04:00
vxlan: Depend on CONFIG_INET
2012-10-02 14:37:31 -04:00
net: loopback: set default mtu to 64K
2012-09-24 16:23:53 -04:00
netlink: add attributes to fdb interface
2012-10-01 18:39:44 -04:00
macvtap: rcu_dereference outside read-lock section
2012-08-12 13:40:48 -07:00
vxlan: virtual extensible lan
2012-10-01 18:39:45 -04:00
netconsole: add oops_only module option
2012-11-08 22:06:36 -05:00
rapidio/rionet: rework to support multiple RIO master ports
2012-10-06 03:05:23 +09:00
Fix misspellings of "whether" in comments.
2012-11-19 14:31:35 +01:00
tuntap: dont use skb after netif_rx_ni(skb)
2012-12-13 12:58:11 -05:00
rtnelink: remove unused parameter from rtnl_create_link().
2012-11-30 12:24:40 -05:00
virtio_net: fix a typo in virtnet_alloc_queues()
2012-12-10 13:46:28 -05:00
vxlan: Add capability of Rx checksum offload for inner packet
2012-12-09 00:20:28 -05:00
drivers/net: fix up function prototypes after __dev* removals
2012-12-07 14:22:22 -05:00
8d9ea7172e