iMX/i2som-imx-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
3ac108006fd7f20cb8fc8ea2287f1497bcda00a1
i2som-imx-linux/include/net
History
David S. Miller 24bc518a68 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/wireless/iwlwifi/pcie/tx.c

Minor iwlwifi conflict in TX queue disabling between 'net', which
removed a bogus warning, and 'net-next' which added some status
register poking code.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-11-25 12:49:17 -05:00
..
9p
…
bluetooth
Bluetooth: AMP: Get amp_mgr reference in HS hci_conn
2012-10-18 07:27:20 -03:00
caif
…
irda
…
iucv
…
netfilter
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
netns
sctp: Make hmac algorithm selection for cookie generation dynamic
2012-10-26 02:22:18 -04:00
nfc
NFC: Use IDR library to assing NFC devices IDs
2012-10-26 18:26:51 +02:00
phonet
…
sctp
sctp: send abort chunk when max_retrans exceeded
2012-11-20 15:50:37 -05:00
tc_act
…
act_api.h
…
addrconf.h
netfilter: ip6tables: add MASQUERADE target
2012-08-30 03:00:18 +02:00
af_ieee802154.h
…
af_rxrpc.h
…
af_unix.h
unix: Remove unused field from unix_sock
2012-10-21 20:37:06 -04:00
ah.h
…
arp.h
…
atmclip.h
…
ax25.h
…
ax88796.h
…
cfg80211-wext.h
…
cfg80211.h
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2012-10-29 16:05:51 -04:00
checksum.h
net: core: add function for incremental IPv6 pseudo header checksum updates
2012-08-30 03:00:16 +02:00
cipso_ipv4.h
…
cls_cgroup.h
net: Update args to dummy sock_update_classid().
2012-10-26 05:07:00 -04: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
…
dsfield.h
…
dst_ops.h
…
dst.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2012-08-22 14:21:38 -07:00
esp.h
…
ethoc.h
…
fib_rules.h
…
flow_keys.h
…
flow.h
ipv4: Add FLOWI_FLAG_KNOWN_NH
2012-10-08 17:42:36 -04:00
garp.h
…
gen_stats.h
…
genetlink.h
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
gre.h
…
gro_cells.h
net: add gro_cells infrastructure
2012-10-01 17:01:46 -04:00
icmp.h
…
ieee80211_radiotap.h
wireless: add radiotap A-MPDU status field
2012-08-20 13:53:09 +02:00
ieee802154_netdev.h
…
ieee802154.h
…
if_inet6.h
…
inet6_connection_sock.h
…
inet6_hashtables.h
…
inet_common.h
…
inet_connection_sock.h
…
inet_ecn.h
tunnel: drop packet if ECN present with not-ECT
2012-09-27 18:12:37 -04:00
inet_frag.h
ipv6: unify fragment thresh handling code
2012-09-19 17:23:28 -04:00
inet_hashtables.h
…
inet_sock.h
net: use a per task frag allocator
2012-09-24 16:31:37 -04:00
inet_timewait_sock.h
…
inetpeer.h
…
ip6_checksum.h
ipv6: Separate tcp offload functionality
2012-11-15 17:36:18 -05:00
ip6_fib.h
ipv6: remove rt6i_peer_genid from rt6_info and its handler
2012-11-08 21:16:08 -05:00
ip6_route.h
ipv6: export IP6_RT_PRIO_* to userland
2012-11-16 01:47:40 -05:00
ip6_tunnel.h
…
ip_fib.h
ipv4: add a fib_type to fib_info
2012-10-04 13:58:26 -04:00
ip_vs.h
ipvs: fix build errors related to config option combinations
2012-10-23 09:23:40 +09:00
ip.h
ipv4: fix path MTU discovery with connection tracking
2012-08-26 19:13:55 +02:00
ipcomp.h
…
ipconfig.h
…
ipip.h
net: convert __IPTUNNEL_XMIT() to an inline function
2012-11-14 18:49:50 -05:00
ipv6.h
ipv6: make ip6_frag_nqueues() and ip6_frag_mem() static inline
2012-09-19 17:23:28 -04:00
ipx.h
…
iw_handler.h
…
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
llc: Remove stray reference to sysctl_llc_station_ack_timeout.
2012-09-17 13:13:24 -04:00
mac80211.h
mac80211: expose AES-CMAC subkey calculation
2012-10-23 19:52:52 +02:00
mac802154.h
…
mip6.h
…
mld.h
…
ndisc.h
…
neighbour.h
…
net_namespace.h
userns: make each net (net_ns) belong to a user_ns
2012-11-18 20:30:55 -05:00
net_ratelimit.h
…
netdma.h
…
netevent.h
…
netlabel.h
userns: Convert the audit loginuid to be a kuid
2012-09-17 18:08:54 -07:00
netlink.h
netlink: Rename pid to portid to avoid confusion
2012-09-10 15:30:41 -04:00
netprio_cgroup.h
cgroup: Assign subsystem IDs during compile time
2012-09-14 09:57:43 -07:00
netrom.h
…
nexthop.h
…
nl802154.h
…
p8022.h
…
ping.h
…
pkt_cls.h
…
pkt_sched.h
…
protocol.h
net: Remove code duplication between offload structures
2012-11-15 17:39:51 -05:00
psnap.h
…
raw.h
…
rawv6.h
…
red.h
…
regulatory.h
…
request_sock.h
tcp: better retrans tracking for defer-accept
2012-11-03 14:45:00 -04:00
rose.h
…
route.h
ipv4: avoid a test in ip_rt_put()
2012-11-03 14:59:04 -04:00
rtnetlink.h
…
sch_generic.h
…
scm.h
net: Remove unnecessary NULL check in scm_destroy().
2012-09-24 15:52:33 -04:00
secure_seq.h
…
slhc_vj.h
…
snmp.h
…
sock.h
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2012-10-02 13:38:27 -07:00
stp.h
…
tcp_memcontrol.h
…
tcp_states.h
…
tcp.h
tcp: remove dead prototype for tcp_v4_get_peer()
2012-11-23 14:10:31 -05:00
timewait_sock.h
…
transp_v6.h
…
udp.h
…
udplite.h
…
wext.h
…
wimax.h
…
wpan-phy.h
…
x25.h
…
x25device.h
…
xfrm.h
xfrm: Fix the gc threshold value for ipv4
2012-11-13 09:15:07 +01:00