Linus Torvalds
aecdc33e11
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next ...
Pull networking changes from David Miller:
1) GRE now works over ipv6, from Dmitry Kozlov.
2) Make SCTP more network namespace aware, from Eric Biederman.
3) TEAM driver now works with non-ethernet devices, from Jiri Pirko.
4) Make openvswitch network namespace aware, from Pravin B Shelar.
5) IPV6 NAT implementation, from Patrick McHardy.
6) Server side support for TCP Fast Open, from Jerry Chu and others.
7) Packet BPF filter supports MOD and XOR, from Eric Dumazet and Daniel
Borkmann.
8) Increate the loopback default MTU to 64K, from Eric Dumazet.
9) Use a per-task rather than per-socket page fragment allocator for
outgoing networking traffic. This benefits processes that have very
many mostly idle sockets, which is quite common.
From Eric Dumazet.
10) Use up to 32K for page fragment allocations, with fallbacks to
smaller sizes when higher order page allocations fail. Benefits are
a) less segments for driver to process b) less calls to page
allocator c) less waste of space.
From Eric Dumazet.
11) Allow GRO to be used on GRE tunnels, from Eric Dumazet.
12) VXLAN device driver, one way to handle VLAN issues such as the
limitation of 4096 VLAN IDs yet still have some level of isolation.
From Stephen Hemminger.
13) As usual there is a large boatload of driver changes, with the scale
perhaps tilted towards the wireless side this time around.
Fix up various fairly trivial conflicts, mostly caused by the user
namespace changes.
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next: (1012 commits)
hyperv: Add buffer for extended info after the RNDIS response message.
hyperv: Report actual status in receive completion packet
hyperv: Remove extra allocated space for recv_pkt_list elements
hyperv: Fix page buffer handling in rndis_filter_send_request()
hyperv: Fix the missing return value in rndis_filter_set_packet_filter()
hyperv: Fix the max_xfer_size in RNDIS initialization
vxlan: put UDP socket in correct namespace
vxlan: Depend on CONFIG_INET
sfc: Fix the reported priorities of different filter types
sfc: Remove EFX_FILTER_FLAG_RX_OVERRIDE_IP
sfc: Fix loopback self-test with separate_tx_channels=1
sfc: Fix MCDI structure field lookup
sfc: Add parentheses around use of bitfield macro arguments
sfc: Fix null function pointer in efx_sriov_channel_type
vxlan: virtual extensible lan
igmp: export symbol ip_mc_leave_group
netlink: add attributes to fdb interface
tg3: unconditionally select HWMON support when tg3 is enabled.
Revert "net: ti cpsw ethernet: allow reading phy interface mode from DT"
gre: fix sparse warning
...
2012-10-02 13:38:27 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
2012-09-24 14:39:16 -04:00
caif-hsi: Remove use of module parameters
2012-06-25 16:44:12 -07:00
TTY: ircomm, use tty from tty_port
2012-06-12 15:50:24 -07:00
af_iucv: add shutdown for HS transport
2012-03-07 22:52:24 -08:00
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-10-02 11:11:09 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2012-09-28 11:11:16 -04:00
net: remove my future former mail address
2012-06-17 16:29:38 -07:00
sctp: fix a compile error in sctp.h
2012-08-15 03:43:43 -07:00
netfilter: ip6tables: add MASQUERADE target
2012-08-30 03:00:18 +02:00
af_unix: speedup /proc/net/unix
2012-06-08 14:27:23 -07:00
net: Dont use ifindices in hash fns
2012-08-09 16:18:06 -07:00
userns: Convert net/ax25 to use kuid_t where appropriate
2012-08-14 21:49:42 -07:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
2012-09-28 11:11:16 -04:00
net: core: add function for incremental IPv6 pseudo header checksum updates
2012-08-30 03:00:16 +02:00
cipso: handle CIPSO options correctly when NetLabel is disabled
2012-06-01 14:18:29 -04:00
cgroup: Assign subsystem IDs during compile time
2012-09-14 09:57:43 -07:00
codel: refine one condition to avoid a nul rec_inv_sqrt
2012-08-10 16:52:54 -07:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
net/dcb: Add an optional max rate attribute
2012-04-05 05:08:04 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
decnet: Use neighbours privately in dn_route struct.
2012-07-05 01:12:14 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-08-22 14:21:38 -07:00
net: Fix warnings in dst_ops.h
2012-07-19 10:43:03 -07:00
ipv4: Elide fib_validate_source() completely when possible.
2012-06-29 01:36:36 -07:00
ipv4: Kill FLOWI_FLAG_RT_NOCACHE and associated code.
2012-07-20 13:36:54 -07:00
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
net: add gro_cells infrastructure
2012-10-01 17:01:46 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
wireless: add radiotap A-MPDU status field
2012-08-20 13:53:09 +02:00
mac802154: declare reduced mlme operations
2012-05-16 15:16:56 -04:00
net: delete all instances of special processing for token ring
2012-05-15 20:14:35 -04:00
ipv6: Add helper inet6_csk_update_pmtu().
2012-07-16 03:44:56 -07:00
ipv6: Early TCP socket demux
2012-07-26 15:50:39 -07:00
net-tcp: Fast Open client - sendmsg(MSG_FASTOPEN)
2012-07-19 11:02:03 -07:00
net: ipv6: fix TCP early demux
2012-08-06 13:33:21 -07:00
tunnel: drop packet if ECN present with not-ECT
2012-09-27 18:12:37 -04:00
ipv6: unify fragment thresh handling code
2012-09-19 17:23:28 -04:00
ipv4: Early TCP socket demux.
2012-06-19 21:22:05 -07:00
net: use a per task frag allocator
2012-09-24 16:31:37 -04:00
ipv4: Maintain redirect and PMTU info in struct rtable again.
2012-07-10 22:40:14 -07:00
ipv4: fix path MTU discovery with connection tracking
2012-08-26 19:13:55 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-28 14:40:49 -04:00
ipv6: fix inet6_csk_xmit()
2012-07-18 08:59:58 -07:00
gre: Support GRE over IPv6
2012-08-14 14:28:32 -07:00
ipv4: Cache routes in nexthop exception entries.
2012-07-31 15:02:02 -07:00
ipvs: add pmtu_disc option to disable IP DF for TUN packets
2012-08-10 10:35:07 +09:00
ipv4: gre: add GRO capability
2012-10-01 17:01:57 -04:00
ipv6: make ip6_frag_nqueues() and ip6_frag_mem() static inline
2012-09-19 17:23:28 -04:00
lapb: Neaten debugging
2012-05-17 18:45:20 -04:00
llc: Remove stray reference to sysctl_llc_station_ack_timeout.
2012-09-17 13:13:24 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
net: delete all instances of special processing for token ring
2012-05-15 20:14:35 -04:00
mac80211: add key flag for management keys
2012-09-10 11:29:17 +02:00
mac802154: add wpan device-class support
2012-06-26 21:06:11 -07:00
net: Dont use ifindices in hash fns
2012-08-09 16:18:06 -07:00
net: output path optimizations
2012-08-07 16:24:55 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-09-28 14:40:49 -04:00
net: Pass neighbours and dest address into NETEVENT_REDIRECT events.
2012-07-05 02:21:55 -07:00
userns: Convert the audit loginuid to be a kuid
2012-09-17 18:08:54 -07:00
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
cgroup: Assign subsystem IDs during compile time
2012-09-14 09:57:43 -07:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ipv6: Early TCP socket demux
2012-07-26 15:50:39 -07:00
ipv6: bool/const conversions phase2
2012-05-19 01:08:16 -04:00
net_sched: red: Make minor corrections to comments
2012-04-16 23:53:11 -04:00
cfg80211: add cellular base station regulatory hint support
2012-07-17 12:16:39 +02:00
tcp: TCP Fast Open Server - support TFO listeners
2012-08-31 20:02:19 -04:00
ipv4/route: arg delay is useless in rt_cache_flush()
2012-09-18 15:44:34 -04:00
rtnl: allow to specify different num for rx and tx queue count
2012-07-20 11:06:59 -07:00
net sched: Pass the skb into change so it can access NETLINK_CB
2012-08-14 21:55:28 -07:00
net: Remove unnecessary NULL check in scm_destroy().
2012-09-24 15:52:33 -04:00
net: avoid reloads in SNMP_UPD_PO_STATS
2012-08-06 13:40:47 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace
2012-10-02 11:11:09 -07:00
cgroup: pass struct mem_cgroup instead of struct cgroup to socket memcg
2012-04-10 10:04:07 -07:00
[PATCH] tcp: Cache inetpeer in timewait socket, and only when necessary.
2012-06-09 14:56:12 -07:00
net/ipv6/udp: UDP encapsulation: introduce encap_rcv hook into IPv6
2012-04-28 22:21:51 -04:00
net: ipv4: Standardize prefixes for message logging
2012-03-12 17:05:21 -07:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
mac802154: monitor device support
2012-05-16 15:17:08 -04:00
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
aecdc33e11