Jiri Benc
125372faa4
gre: receive also TEB packets for lwtunnels ...
For ipgre interfaces in collect metadata mode, receive also traffic with
encapsulated Ethernet headers. The lwtunnel users are supposed to sort this
out correctly. This allows to have mixed Ethernet + L3-only traffic on the
same lwtunnel interface. This is the same way as VXLAN-GPE behaves.
To keep backwards compatibility and prevent any surprises, gretap interfaces
have priority in receiving packets with Ethernet headers.
Signed-off-by: Jiri Benc <jbenc@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
2016-05-04 14:11:32 -04:00
Bluetooth: Add defines for SPI and I2C
2016-04-22 15:02:21 +02:00
s390/iucv: do not use arrays as argument
2015-09-21 16:03:04 -07:00
netfilter: connlabels: change nf_connlabels_get bit arg to 'highest used'
2016-04-18 20:39:48 +02:00
net: ipv4: Consider failed nexthops in multipath routes
2016-04-11 15:16:13 -04:00
nfc: netlink: HCI event connectivity implementation
2015-12-29 19:06:20 +01:00
sock: struct proto hash function may error
2016-02-11 03:54:14 -05:00
sctp: signal sk_data_ready earlier on data chunks reception
2016-05-01 21:06:10 -04:00
net/act_skbedit: Utility functions for mark action
2016-03-10 16:24:02 -05:00
6lowpan: move mac802154 header
2016-04-13 10:41:10 +02:00
net_sched: fix a memory leak in tc action
2016-04-06 16:04:29 -04:00
inet: refactor inet[6]_lookup functions to take skb
2016-02-11 03:54:14 -05:00
ieee802154: af_ieee802154: fix typo in comment.
2015-09-17 13:20:05 +02:00
rxrpc: Differentiate local and remote abort codes in structs
2016-04-11 15:34:40 -04:00
unix: correctly track in-flight fds in sending process user_struct
2016-02-08 10:30:42 -05:00
Revert "Merge branch 'vsock-virtio'"
2015-12-08 21:55:49 -05:00
ax25: Stop using sock->sk_protinfo.
2015-06-28 16:55:44 -07:00
bonding: 3ad: apply ad_actor settings changes immediately
2016-02-09 04:45:49 -05:00
bonding: convert num_grat_arp to the new bonding option API
2015-07-27 01:05:24 -07:00
bonding: fix bond_get_stats()
2016-03-18 23:14:15 -04:00
net: un-inline sk_busy_loop()
2015-11-18 16:17:38 -05:00
cfg80211: remove enum ieee80211_band
2016-04-12 15:56:15 +02:00
nl802154: add support for security layer
2015-09-30 13:16:44 +02:00
csum: Update csum_block_add to use rotate instead of byteswap
2016-03-13 15:01:00 -04:00
cls_cgroup: get sk_classid only from full sockets
2016-04-19 20:09:25 -04:00
codel: split into multiple files
2016-04-25 16:44:27 -04:00
codel: split into multiple files
2016-04-25 16:44:27 -04:00
codel: split into multiple files
2016-04-25 16:44:27 -04:00
devlink: fix sb register stub in case devlink is disabled
2016-04-15 12:57:29 -04:00
netfilter: Pass net into okfn
2015-09-17 17:18:37 -07:00
net: dsa: Provide CPU port statistics to master netdev
2016-04-28 17:16:17 -04:00
route: move lwtunnel state to a single place
2016-04-25 16:20:09 -04:00
net: add dst_cache support
2016-02-16 20:21:48 -05:00
ip_tunnel: add support for setting flow label via collect metadata
2016-03-11 15:14:26 -05:00
ipv4, ipv6: Pass net into __ip_local_out and __ip6_local_out
2015-10-08 04:27:02 -07:00
net/ethoc: support big-endian register layout
2015-09-23 15:33:15 -07:00
net: ipv6: use common fib_default_rule_pref
2015-09-09 14:19:50 -07:00
ipv6, trace: fix tos reporting on fib6_table_lookup
2016-03-20 13:44:34 -04:00
net/flow_dissector: Make dissector_uses_key() and skb_flow_dissector_target() public
2016-03-10 16:24:02 -05:00
fq: add fair queuing framework
2016-04-25 16:45:53 -04:00
fq: split out backlog update logic
2016-04-28 17:03:38 -04:00
sched: align nlattr properly when needed
2016-04-26 12:00:49 -04:00
Revert "genl: Add genlmsg_new_unicast() for unicast message allocation"
2016-02-18 11:42:19 -05:00
geneve: break dependency with netdev drivers
2016-04-21 15:35:44 -04:00
gre: change gre_parse_header to return the header length
2016-05-04 12:44:45 -04:00
gro_cells: remove spinlock protecting receive queues
2015-08-31 15:17:17 -07:00
net: add a hardware buffer management helper API
2016-03-14 12:19:46 -04:00
net: snmp: kill STATS_BH macros
2016-04-27 22:48:25 -04:00
mac802154: constify ieee802154_llsec_ops structure
2016-01-04 20:40:41 +01:00
ila: Add generic ILA translation facility
2015-12-15 23:25:20 -05:00
ipv6: remove unused in6_addr struct
2016-03-22 15:45:44 -04:00
tcp/dccp: do not touch listener sk_refcnt under synflood
2016-04-04 22:11:20 -04:00
net: avoid NULL deref in inet_ctl_sock_destroy()
2015-11-02 22:46:09 -05:00
tcp/dccp: fix another race at listener dismantle
2016-02-18 11:35:51 -05:00
ipv6: update skb->csum when CE mark is propagated
2016-01-15 15:07:23 -05:00
ipv4: namespacify ip fragment max dist sysctl knob
2016-02-16 20:42:54 -05:00
tcp/dccp: do not touch listener sk_refcnt under synflood
2016-04-04 22:11:20 -04:00
net: Allow accepted sockets to be bound to l3mdev domain
2015-12-18 14:43:38 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-10-20 06:08:27 -07:00
inet: tcp: fix inetpeer_set_addr_v4()
2015-12-16 00:14:12 -05:00
net: snmp: kill STATS_BH macros
2016-04-27 22:48:25 -04:00
ipv6: Pass proto to csum_ipv6_magic as __u8 instead of unsigned short
2016-03-13 23:55:13 -04:00
ipv6: Check rt->dst.from for the DST_NOCACHE route
2015-11-15 17:12:37 -05:00
net: vrf: Fix dst reference counting
2016-04-11 15:56:20 -04:00
ipv6: Generic tunnel cleanup
2016-05-02 19:23:32 -04:00
route: check and remove route cache when we get route
2016-02-18 11:31:36 -05:00
gre: receive also TEB packets for lwtunnels
2016-05-04 14:11:32 -04:00
ipvs: drop first packet to redirect conntrack
2016-03-07 11:53:30 +09:00
ipv6: add new struct ipcm6_cookie
2016-05-03 16:08:14 -04:00
cfg80211/wext: fix message ordering
2016-01-29 17:13:43 +01:00
kcm: mark helper functions inline
2016-03-10 14:42:03 -05:00
net: l3mdev: address selection should only consider devices in L3 domain
2016-02-26 14:22:26 -05:00
lwtunnel: autoload of lwt modules
2016-02-21 22:00:28 -05:00
cfg80211: remove enum ieee80211_band
2016-04-12 15:56:15 +02:00
ieee802154: add short address helpers
2016-04-13 10:41:08 +02:00
mpls: multipath route support
2015-10-23 06:26:42 -07:00
Revert "ipv6: ndisc: inherit metadata dst when creating ndisc requests"
2015-12-01 15:07:59 -05:00
net: add explicit logging and stat for neighbour table overflow
2015-08-10 13:46:21 -07:00
netfilter: cttimeout: add netns support
2015-12-14 12:48:58 +01:00
libnl: add nla_put_u64_64bit() helper
2016-04-23 20:13:25 -04:00
net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct
2015-12-08 22:02:33 -05:00
libnl: nla_put_le64(): align on a 64-bit area
2016-04-23 20:13:24 -04:00
net: ping: make ping_v6_sendmsg static
2016-03-23 22:09:58 -04:00
net/flower: Fix pointer cast
2016-03-11 12:04:37 -05:00
net: sched: consolidate tc_classify{,_compat}
2015-08-27 14:18:48 -07:00
udp: Remove udp_offloads
2016-04-07 16:53:30 -04:00
sock: struct proto hash function may error
2016-02-11 03:54:14 -05:00
inet: reqsk_alloc() needs to take care of dead listeners
2016-04-04 22:11:19 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-04-23 18:51:33 -04:00
net: rtnetlink: add linkxstats callbacks and attribute
2016-05-02 22:27:06 -04:00
net: sched: use pfifo_fast for non real queues
2016-03-03 17:38:46 -05:00
unix: correctly track in-flight fds in sending process user_struct
2016-02-08 10:30:42 -05:00
net: snmp: fix 64bit stats on 32bit arches
2016-04-28 11:49:45 -04:00
net: add __sock_wfree() helper
2016-05-03 16:02:36 -04:00
soreuseport: fix NULL ptr dereference SO_REUSEPORT after bind
2016-01-19 14:44:23 -05:00
switchdev: Adding complete operation to deferred switchdev ops
2016-04-24 14:23:32 -04:00
tcp: Make use of MSG_EOR in tcp_sendmsg
2016-04-28 16:14:18 -04:00
inet: remove BUG_ON() in twsk_destructor()
2015-07-09 15:12:20 -07:00
ipv6: add new struct ipcm6_cookie
2016-05-03 16:08:14 -04:00
net: tso: add support for IPv6
2015-10-26 22:24:22 -07:00
net: snmp: kill STATS_BH macros
2016-04-27 22:48:25 -04:00
ip_tunnel_core: iptunnel_handle_offloads returns int and doesn't free skb
2016-04-16 19:09:13 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-05-04 00:52:29 -04:00
net: xfrm: kill XFRM_INC_STATS_BH()
2016-04-27 22:48:23 -04:00
125372faa4