openstlinux/linux-st
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
aee3bfa3307cd0da2126bdc0ea359dabea5ee8f7
linux-st/include/net
History
David S. Miller 9d367eddf3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/ethernet/mellanox/mlxsw/spectrum.h
	drivers/net/ethernet/mellanox/mlxsw/spectrum_switchdev.c

The bond_main.c and mellanox switch conflicts were cases of
overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2016-01-11 23:55:43 -05:00
..
9p
…
bluetooth
Bluetooth: Add support for Start Limited Discovery command
2016-01-05 17:02:50 +01:00
caif
…
irda
…
iucv
…
netfilter
netfilter: nf_tables: Add new attributes into nft_set to store user data.
2016-01-08 13:25:08 +01:00
netns
ipv4: Namespecify the tcp_keepalive_intvl sysctl knob
2016-01-10 17:32:09 -05:00
nfc
nfc: netlink: HCI event connectivity implementation
2015-12-29 19:06:20 +01:00
phonet
…
sctp
sctp: drop the old assoc hashtable of sctp
2016-01-05 12:24:01 -05:00
tc_act
…
6lowpan.h
6lowpan: add debugfs support
2015-12-10 01:25:25 +01:00
act_api.h
…
addrconf.h
soreuseport: fast reuseport UDP socket selection
2016-01-04 22:49:58 -05:00
af_ieee802154.h
…
af_rxrpc.h
…
af_unix.h
unix: avoid use-after-free in ep_remove_wait_queue
2015-11-23 12:29:58 -05:00
af_vsock.h
Revert "Merge branch 'vsock-virtio'"
2015-12-08 21:55:49 -05:00
ah.h
…
arp.h
…
atmclip.h
…
ax25.h
…
ax88796.h
…
bond_3ad.h
bonding: simplify / unify event handling code for 3ad mode.
2015-11-02 22:52:24 -05:00
bond_alb.h
…
bond_options.h
…
bonding.h
bonding: implement lower state change propagation
2015-12-03 11:49:27 -05:00
busy_poll.h
net: un-inline sk_busy_loop()
2015-11-18 16:17:38 -05:00
cfg80211-wext.h
…
cfg80211.h
cfg80211: Add support for aborting an ongoing scan
2015-12-04 14:43:32 +01:00
cfg802154.h
nl802154: add support for security layer
2015-09-30 13:16:44 +02:00
checksum.h
rco: Clean up casting errors
2015-12-13 23:57:45 -05:00
cipso_ipv4.h
…
cls_cgroup.h
net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct
2015-12-08 22:02:33 -05:00
codel.h
…
compat.h
…
datalink.h
…
dcbevent.h
…
dcbnl.h
…
dn_dev.h
…
dn_fib.h
…
dn_neigh.h
…
dn_nsp.h
…
dn_route.h
…
dn.h
…
dsa.h
net: dsa: remove DSA link polling
2015-12-07 16:35:49 -05:00
dsfield.h
…
dst_metadata.h
tun_dst: Fix potential NULL dereference
2015-11-04 21:59:22 -05:00
dst_ops.h
ipv4, ipv6: Pass net into __ip_local_out and __ip6_local_out
2015-10-08 04:27:02 -07:00
dst.h
net: fix IP early demux races
2015-12-14 23:52:00 -05:00
esp.h
…
ethoc.h
…
fib_rules.h
…
firewire.h
…
flow_dissector.h
…
flow.h
net: Rename FLOWI_FLAG_VRFSRC to FLOWI_FLAG_L3MDEV_SRC
2015-10-07 04:27:42 -07:00
flowcache.h
…
fou.h
…
garp.h
…
gen_stats.h
…
genetlink.h
netlink: add a start callback for starting a netlink dump
2015-12-15 23:25:20 -05:00
geneve.h
geneve: Add geneve_get_rx_port support
2015-12-16 10:58:56 -05:00
gre.h
…
gro_cells.h
…
gue.h
…
icmp.h
…
ieee80211_radiotap.h
…
ieee802154_netdev.h
mac802154: constify ieee802154_llsec_ops structure
2016-01-04 20:40:41 +01:00
if_inet6.h
…
ila.h
ila: Add generic ILA translation facility
2015-12-15 23:25:20 -05:00
inet6_connection_sock.h
ipv6: remove obsolete inet6 functions
2015-10-03 04:32:42 -07:00
inet6_hashtables.h
…
inet_common.h
net: avoid NULL deref in inet_ctl_sock_destroy()
2015-11-02 22:46:09 -05:00
inet_connection_sock.h
tcp/dccp: fix hashdance race for passive sessions
2015-10-23 05:42:21 -07:00
inet_ecn.h
…
inet_frag.h
inet: kill unused skb_free op
2016-01-05 22:25:57 -05:00
inet_hashtables.h
tcp/dccp: fix hashdance race for passive sessions
2015-10-23 05:42:21 -07:00
inet_sock.h
net: Allow accepted sockets to be bound to l3mdev domain
2015-12-18 14:43:38 -05:00
inet_timewait_sock.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-10-20 06:08:27 -07:00
inetpeer.h
inet: tcp: fix inetpeer_set_addr_v4()
2015-12-16 00:14:12 -05:00
ip6_checksum.h
…
ip6_fib.h
ipv6: Check rt->dst.from for the DST_NOCACHE route
2015-11-15 17:12:37 -05:00
ip6_route.h
ipv6: kill sk_dst_lock
2015-12-03 11:32:06 -05:00
ip6_tunnel.h
net: make ip6tunnel_xmit definition conditional
2016-01-04 21:50:51 -05:00
ip_fib.h
ipv4: eliminate endianness warnings in ip_fib.h
2016-01-08 21:30:43 -05:00
ip_tunnels.h
ip_tunnel: Move stats update to iptunnel_xmit()
2015-12-25 23:32:23 -05:00
ip_vs.h
…
ip.h
ipv4: Pass struct net into ip_defrag and ip_check_defrag
2015-10-12 19:44:16 -07:00
ipcomp.h
…
ipconfig.h
…
ipv6.h
ipv6: add ipv6_addr_prefix_copy
2015-12-10 12:55:28 +01:00
ipx.h
…
iw_handler.h
…
l3mdev.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2016-01-06 22:54:18 -05:00
lapb.h
…
lib80211.h
…
llc_c_ac.h
…
llc_c_ev.h
…
llc_c_st.h
…
llc_conn.h
…
llc_if.h
…
llc_pdu.h
…
llc_s_ac.h
…
llc_s_ev.h
…
llc_s_st.h
…
llc_sap.h
…
llc.h
…
lwtunnel.h
dst: Pass net into dst->output
2015-10-08 04:27:03 -07:00
mac80211.h
mac80211: add new IEEE80211_VIF_GET_NOA_UPDATE flag
2015-12-04 14:43:32 +01:00
mac802154.h
6lowpan: cleanup lowpan_header_decompress
2015-10-21 00:49:24 +02:00
mip6.h
…
mld.h
…
mpls_iptunnel.h
mpls: multipath route support
2015-10-23 06:26:42 -07:00
mpls.h
…
mrp.h
…
ndisc.h
Revert "ipv6: ndisc: inherit metadata dst when creating ndisc requests"
2015-12-01 15:07:59 -05:00
neighbour.h
…
net_namespace.h
netfilter: cttimeout: add netns support
2015-12-14 12:48:58 +01:00
net_ratelimit.h
…
netevent.h
…
netlabel.h
…
netlink.h
netlink: add nla_get for le32 and le64
2015-09-30 13:16:44 +02:00
netprio_cgroup.h
net: wrap sock->sk_cgrp_prioidx and ->sk_classid inside a struct
2015-12-08 22:02:33 -05:00
netrom.h
…
nexthop.h
…
nl802154.h
nl802154: add support for security layer
2015-09-30 13:16:44 +02:00
p8022.h
…
ping.h
…
pkt_cls.h
…
pkt_sched.h
…
protocol.h
udp: restrict offloads to one namespace
2016-01-10 17:28:24 -05:00
psnap.h
…
raw.h
…
rawv6.h
…
red.h
…
regulatory.h
…
request_sock.h
net: add inet_sk_transparent() helper
2015-12-22 17:03:05 -05:00
rose.h
…
route.h
net: Propagate lookup failure in l3mdev_get_saddr to caller
2016-01-04 22:58:30 -05:00
rtnetlink.h
netlink: Rightsize IFLA_AF_SPEC size calculation
2015-10-21 19:15:20 -07:00
sch_generic.h
net, sched: add skb_at_tc_ingress helper
2016-01-10 17:54:28 -05:00
scm.h
…
secure_seq.h
…
slhc_vj.h
…
snmp.h
…
sock_reuseport.h
soreuseport: setsockopt SO_ATTACH_REUSEPORT_[CE]BPF
2016-01-04 22:49:59 -05:00
sock.h
soreuseport: define reuseport groups
2016-01-04 22:49:58 -05:00
Space.h
…
stp.h
…
switchdev.h
switchdev: Adding MDB entry offload
2016-01-10 16:50:20 -05:00
tcp_memcontrol.h
…
tcp_states.h
…
tcp.h
ipv4: Namespecify the tcp_keepalive_intvl sysctl knob
2016-01-10 17:32:09 -05:00
timewait_sock.h
…
transp_v6.h
…
tso.h
net: tso: add support for IPv6
2015-10-26 22:24:22 -07:00
udp_tunnel.h
ip_tunnel: Move stats update to iptunnel_xmit()
2015-12-25 23:32:23 -05:00
udp.h
soreuseport: setsockopt SO_ATTACH_REUSEPORT_[CE]BPF
2016-01-04 22:49:59 -05:00
udplite.h
…
vsock_addr.h
…
vxlan.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-12-17 22:08:28 -05:00
wext.h
…
wimax.h
…
x25.h
…
x25device.h
…
xfrm.h
xfrm: add rcu protection to sk->sk_policy[]
2015-12-11 19:22:06 -05:00