summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2016-04-136-36/+273
|\
| * netfilter: conntrack: move expectation event helper to ecache.cFlorian Westphal2016-04-121-0/+30
| * netfilter: conntrack: de-inline nf_conntrack_eventmask_reportFlorian Westphal2016-04-121-0/+54
| * netfilter: ipv6: unnecessary to check whether ip6_route_output() returns NULLHaishuang Yan2016-04-071-1/+1
| * netfilter: ip6t_SYNPROXY: remove magic number for hop_limitLiping Zhang2016-03-291-26/+30
| * netfilter: bridge: nf queue verdict to use NFQA_VLAN and NFQA_L2HDRStephane Bryant2016-03-291-0/+47
| * netfilter: bridge: pass L2 header and VLAN as netlink attributes in queues to...Stephane Bryant2016-03-291-0/+58
| * netfilter: bridge: add nf_afinfo to enable queuing to userspaceStephane Bryant2016-03-291-2/+45
| * netfilter: nf_conntrack: Uses pr_fmt() for logging.Weongyo Jeong2016-03-281-7/+8
* | Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...David S. Miller2016-04-124-6/+26
|\ \
| * | 6lowpan: iphc: fix handling of link-local compressionAlexander Aring2016-04-081-2/+9
| * | Bluetooth: Allow setting BT_SECURITY_FIPS with setsockoptPatrik Flykt2016-04-081-1/+1
| * | Bluetooth: Ignore unknown advertising packet typesJohan Hedberg2016-04-081-0/+13
| * | Bluetooth: Fix setting NO_BREDR advertising flagJohan Hedberg2016-04-081-3/+3
* | | rxrpc: Create a null security type and get rid of conditional callsDavid Howells2016-04-119-61/+105
* | | rxrpc: Absorb the rxkad security moduleDavid Howells2016-04-116-134/+85Star
* | | rxrpc: Don't assume transport address family and size when using itDavid Howells2016-04-112-4/+4
* | | rxrpc: Don't pass gfp around in incoming call handling functionsDavid Howells2016-04-114-12/+9Star
* | | rxrpc: Differentiate local and remote abort codes in structsDavid Howells2016-04-118-21/+37
* | | rxrpc: Static arrays of strings should be const char *const[]David Howells2016-04-112-2/+2
* | | rxrpc: Move some miscellaneous bits out into their own fileDavid Howells2016-04-115-84/+106
* | | rxrpc: Disable a debugging statement that has been left enabled.David Howells2016-04-111-1/+1
* | | rxrpc: do not pull udp headers on receiveWillem de Bruijn2016-04-111-2/+2
* | | sunrpc: do not pull udp headers on receiveWillem de Bruijn2016-04-113-7/+5Star
* | | net: ipv4: Consider failed nexthops in multipath routesDavid Ahern2016-04-112-5/+40
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2016-04-0934-110/+203
|\ \ \
| * \ \ Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2016-04-0924-51/+144
| |\ \ \
| | * \ \ Merge tag 'mac80211-for-davem-2016-04-06' of git://git.kernel.org/pub/scm/lin...David S. Miller2016-04-088-25/+86
| | |\ \ \
| | | * | | mac80211: fix "warning: ‘target_metric’ may be used uninitialized"Jeff Mahoney2016-04-061-1/+1
| | | * | | mac80211: close the SP when we enqueue frames during the SPEmmanuel Grumbach2016-04-051-0/+6
| | | * | | mac80211: Fix BW upgrade for TDLS peersIlan Peer2016-04-051-1/+2
| | | * | | mac80211: don't send deferred frames outside the SPEmmanuel Grumbach2016-04-051-3/+1Star
| | | * | | mac80211: remove description of dropped memberLuis de Bethencourt2016-04-051-1/+0Star
| | | * | | mac80211: ensure no limits on station rhashtableBen Greear2016-04-051-0/+1
| | | * | | mac80211: properly deal with station hashtable insert errorsJohannes Berg2016-04-051-5/+8
| | | * | | mac80211: recalc min_def chanctx even when chandef is identicalArik Nemtsov2016-04-051-1/+3
| | | * | | mac80211: TDLS: change BW calculation for WIDER_BW peersArik Nemtsov2016-04-053-11/+61
| | | * | | mac80211: TDLS: always downgrade invalid chandefsArik Nemtsov2016-04-051-1/+1
| | | * | | mac80211: fix AP buffered multicast frames with queue control and txqFelix Fietkau2016-04-051-1/+2
| | * | | | mpls: find_outdev: check for err ptr in addition to NULL checkRoopa Prabhu2016-04-081-0/+3
| | * | | | ipv6: Count in extension headers in skb->network_headerJakub Sitnicki2016-04-081-4/+4
| | * | | | RDS: fix congestion map corruption for PAGE_SIZE > 4kshamir rabinovitch2016-04-071-1/+1
| | * | | | RDS: memory allocated must be align to 8shamir rabinovitch2016-04-071-2/+2
| | * | | | GRE: Disable segmentation offloads w/ CSUM and we are encapsulated via FOUAlexander Duyck2016-04-074-3/+25
| | * | | | net: add the AF_KCM entries to family name tablesDexuan Cui2016-04-061-3/+6
| | * | | | VSOCK: Detach QP check should filter out non matching QPs.Jorgen Hansen2016-04-061-2/+2
| | * | | | af_packet: tone down the Tx-ring unsupported spew.Dave Jones2016-04-061-1/+1
| | * | | | Revert "bridge: Fix incorrect variable assignment on error path in br_sysfs_a...David S. Miller2016-04-061-1/+0Star
| | * | | | ip6_tunnel: set rtnl_link_ops before calling register_netdeviceThadeu Lima de Souza Cascardo2016-04-061-1/+1
| | * | | | Revert "netpoll: Fix extra refcount release in netpoll_cleanup()"Bjorn Helgaas2016-04-061-2/+1Star