sugar/linux
1
0
Fork 0
Code Activity
Files
56845d78cee8576a8160cee8aeac62efdb561ae2
linux/include/net
History
David S. Miller 56845d78ce Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/atheros/atlx/atl1.c
	drivers/net/ethernet/atheros/atlx/atl1.h

Resolved a conflict between a DMA error bug fix and NAPI
support changes in the atl1 driver.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-04-15 13:19:04 -04:00
..
9p
9p: Reduce object size with CONFIG_NET_9P_DEBUG
2012-01-05 10:51:44 -06:00
bluetooth
Bluetooth: Fix userspace compatibility issue with mgmt interface
2012-04-05 15:05:51 -03:00
caif
caif-hsi: robust frame aggregation for HSI
2012-04-13 11:37:36 -04:00
irda
…
iucv
af_iucv: add shutdown for HS transport
2012-03-07 22:52:24 -08:00
netfilter
netfilter: xt_LOG: don't use xchg() for simple assignment
2012-03-26 14:00:28 +02:00
netns
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
nfc
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
phonet
…
sctp
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
tc_act
…
act_api.h
…
addrconf.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
af_ieee802154.h
…
af_rxrpc.h
…
af_unix.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ah.h
…
arp.h
ipv4: Eliminate spurious argument to __ipv4_neigh_lookup
2012-02-15 17:48:35 -05:00
atmclip.h
atm: clip: Use device neigh support on top of "arp_tbl".
2011-11-30 18:51:03 -05:00
ax25.h
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
ax88796.h
…
cfg80211-wext.h
cfg80211: remove unused wext handler exports
2011-08-08 14:26:29 -04:00
cfg80211.h
cfg80211: add channel switch notify event
2012-04-11 16:23:59 -04:00
checksum.h
…
cipso_ipv4.h
doc: Update the email address for Paul Moore in various source files
2011-08-01 17:58:33 -07:00
cls_cgroup.h
…
compat.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
datalink.h
…
dcbevent.h
dcb: Add stub routines for !CONFIG_DCB
2011-10-06 15:49:51 -04:00
dcbnl.h
net/dcb: Add an optional max rate attribute
2012-04-05 05:08:04 -04:00
dn_dev.h
…
dn_fib.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
dn_neigh.h
…
dn_nsp.h
…
dn_route.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
dn.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
dsa.h
dsa: Include linux/if_ether.h to fix build error
2011-12-01 11:41:06 -05:00
dsfield.h
…
dst_ops.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
dst.h
ipv6: fix problem with expired dst cache
2012-04-13 12:58:29 -04:00
esp.h
…
ethoc.h
…
fib_rules.h
…
flow_keys.h
flow_dissector: use a 64bit load/store
2011-11-29 13:17:03 -05:00
flow.h
ipv4: reset flowi parameters on route connect
2012-02-04 19:29:48 -05:00
garp.h
…
gen_stats.h
…
genetlink.h
net: Deinline __nlmsg_put and genlmsg_put. -7k code on i386 defconfig.
2012-01-30 15:22:06 -05:00
gre.h
…
icmp.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ieee80211_radiotap.h
wireless: move ieee80211chan2mhz macro
2011-11-11 12:32:50 -05:00
ieee802154_netdev.h
…
ieee802154.h
6LoWPAN: add fragmentation support
2011-11-14 00:19:42 -05:00
if_inet6.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
inet6_connection_sock.h
tcp: bind() use stronger condition for bind_conflict
2012-04-14 15:28:55 -04:00
inet6_hashtables.h
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
inet_common.h
…
inet_connection_sock.h
tcp: bind() use stronger condition for bind_conflict
2012-04-14 15:28:55 -04:00
inet_ecn.h
inet: add rfc 3168 extract in front of INET_ECN_encapsulate()
2011-10-22 01:25:23 -04:00
inet_frag.h
…
inet_hashtables.h
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
inet_sock.h
net: implement IP_RECVTOS for IP_PKTOPTIONS
2012-02-13 00:46:41 -05:00
inet_timewait_sock.h
inet: remove rcu protection on tw_net
2011-12-14 13:34:55 -05:00
inetpeer.h
route: Remove redirect_genid
2012-03-08 00:30:32 -08:00
ip6_checksum.h
…
ip6_fib.h
ipv6: fix problem with expired dst cache
2012-04-13 12:58:29 -04:00
ip6_route.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ip6_tunnel.h
…
ip_fib.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ip_vs.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ip.h
ipv4: Make ip_call_ra_chain() return bool.
2012-03-09 14:34:50 -08:00
ipcomp.h
…
ipconfig.h
…
ipip.h
tunnel: implement 64 bits statistics
2012-04-14 14:47:05 -04:00
ipv6.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
ipx.h
…
iw_handler.h
…
lapb.h
wan: make LAPB callbacks const
2011-09-16 19:20:20 -04:00
lib80211.h
include: replace linux/module.h with "struct module" wherever possible
2011-10-31 19:32:32 -04:00
llc_c_ac.h
…
llc_c_ev.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
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
atomic: use <linux/atomic.h>
2011-07-26 16:49:47 -07:00
mac80211.h
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2012-04-12 13:49:28 -04:00
mip6.h
…
mld.h
…
ndisc.h
Treat ND option 31 as userland (DNSSL support)
2012-04-12 15:56:57 -04:00
neighbour.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
net_namespace.h
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
net_ratelimit.h
…
netdma.h
…
netevent.h
…
netlabel.h
doc: Update the email address for Paul Moore in various source files
2011-08-01 17:58:33 -07:00
netlink.h
netlink: Delete all NLA_PUT*() macros.
2012-04-02 04:33:45 -04:00
netprio_cgroup.h
netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP=m
2012-02-10 15:08:57 -05:00
netrom.h
…
nexthop.h
…
nl802154.h
…
p8022.h
…
ping.h
…
pkt_cls.h
…
pkt_sched.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
protocol.h
net: use IS_ENABLED(CONFIG_IPV6)
2011-12-11 18:25:16 -05:00
psnap.h
…
raw.h
…
rawv6.h
…
red.h
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
regulatory.h
cfg80211: pass DFS region to drivers through reg_notifier()
2011-11-21 16:20:41 -05:00
request_sock.h
tcp: Change possible SYN flooding messages
2011-09-15 14:49:43 -04:00
rose.h
…
route.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
rtnetlink.h
rtnetlink: ops->get_tx_queue() cannot take a const 'tb'.
2012-04-13 14:21:04 -04:00
sch_generic.h
net: Make qdisc_skb_cb upper size bound explicit.
2012-02-09 13:50:34 -05:00
scm.h
af_unix: dont send SCM_CREDENTIALS by default
2011-09-28 13:29:50 -04:00
secure_seq.h
tcp: add const qualifiers where possible
2011-10-21 05:22:42 -04:00
slhc_vj.h
…
snmp.h
Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
2012-01-09 13:08:28 -08:00
sock.h
poll: add poll_requested_events() and poll_does_not_wait() functions
2012-03-23 16:58:38 -07:00
stp.h
…
tcp_memcontrol.h
cgroup: remove cgroup_subsys argument from callbacks
2012-02-02 09:20:22 -08:00
tcp_states.h
…
tcp.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
timewait_sock.h
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
transp_v6.h
net: relax PKTINFO non local ipv6 udp xmit check
2011-08-30 17:39:01 -04:00
udp.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
udplite.h
net: ipv4: Standardize prefixes for message logging
2012-03-12 17:05:21 -07:00
wext.h
…
wimax.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
wpan-phy.h
BUG: headers with BUG/BUG_ON etc. need linux/bug.h
2012-03-04 17:54:34 -05:00
x25.h
net: cleanup unsigned to unsigned int
2012-04-15 12:44:40 -04:00
x25device.h
…
xfrm.h
xfrm: Stop using NLA_PUT*().
2012-04-02 04:33:45 -04:00