summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 6lowpan: change naming for lowpan private dataAlexander Aring2016-04-139-90/+94
* ieee802154: 6lowpan: fix short addr hashAlexander Aring2016-04-131-1/+1
* nl802154: avoid address change while running lowpanAlexander Aring2016-04-131-0/+10
* ieee802154: add short address helpersAlexander Aring2016-04-132-0/+39
* ieee802154: cleanups for ieee802154.hAlexander Aring2016-04-131-3/+3
* mrf24j40: apply the security-enabled bit on secured outbound framesAlexandre Macabies2016-04-131-0/+4
* mrf24j40: fix security-enabled processing on inbound framesAlexandre Macabies2016-04-131-1/+9
* ieee802154: add security bit check functionAlexandre Macabies2016-04-131-0/+10
* Merge branch 'mediatek-stress-test-fixes'David S. Miller2016-04-132-44/+66
|\
| * net: mediatek: do not set the QID field in the TX DMA descriptorsJohn Crispin2016-04-131-2/+1
| * net: mediatek: move the pending_work struct to the device generic structJohn Crispin2016-04-132-10/+7
| * net: mediatek: fix mtk_pending_workJohn Crispin2016-04-131-8/+20
| * net: mediatek: fix TX lockingJohn Crispin2016-04-131-10/+10
| * net: mediatek: fix stop and wakeup of queueJohn Crispin2016-04-131-10/+27
| * net: mediatek: remove superfluous reset callJohn Crispin2016-04-131-4/+0
| * net: mediatek: mtk_cal_txd_req() returns bad valueJohn Crispin2016-04-131-1/+1
| * net: mediatek: watchdog_timeo was not setJohn Crispin2016-04-131-0/+1
|/
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-nextDavid S. Miller2016-04-138-129/+298
|\
| * netfilter: conntrack: move expectation event helper to ecache.cFlorian Westphal2016-04-122-39/+33
| * netfilter: conntrack: de-inline nf_conntrack_eventmask_reportFlorian Westphal2016-04-122-54/+66
| * 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-292-0/+68
| * 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-1210-39/+74
|\ \
| * | Bluetooth: hci_bcsp: fix code styleMaxim Zhukov2016-04-081-26/+31
| * | ieee802154/adf7242: fix memory leak of firmwareSudip Mukherjee2016-04-081-0/+2
| * | 6lowpan: iphc: fix handling of link-local compressionAlexander Aring2016-04-081-2/+9
| * | Bluetooth: vhci: purge unhandled skbsJiri Slaby2016-04-081-0/+1
| * | Bluetooth: vhci: fix open_timeout vs. hdev raceJiri Slaby2016-04-081-3/+5
| * | Bluetooth: Allow setting BT_SECURITY_FIPS with setsockoptPatrik Flykt2016-04-081-1/+1
| * | Bluetooth: hci_ldisc: Fix null pointer derefence in case of early dataLoic Poulain2016-04-082-4/+8
| * | Bluetooth: hci_bcm: Add BCM2E71 ACPI IDLoic Poulain2016-04-081-0/+1
| * | Bluetooth: Ignore unknown advertising packet typesJohan Hedberg2016-04-081-0/+13
| * | Bluetooth: Fix setting NO_BREDR advertising flagJohan Hedberg2016-04-081-3/+3
* | | net: mdio: Fix lockdep falls positive splatAndrew Lunn2016-04-123-10/+15
* | | Merge branch 'rprpc-2nd-rewrite-part-1'David S. Miller2016-04-1120-326/+374
|\ \ \
| * | | 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/+85
| * | | 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/+9
| * | | rxrpc: Differentiate local and remote abort codes in structsDavid Howells2016-04-1110-25/+50
| * | | rxrpc: Static arrays of strings should be const char *const[]David Howells2016-04-113-4/+2
| * | | rxrpc: Move some miscellaneous bits out into their own fileDavid Howells2016-04-116-84/+107
| * | | rxrpc: Disable a debugging statement that has been left enabled.David Howells2016-04-111-1/+1
| * | | afs: Wait for outstanding async calls before closing rxrpc socketDavid Howells2016-04-111-3/+13
|/ / /
* | | Merge branch 'udp-pull'David S. Miller2016-04-114-9/+7
|\ \ \
| * | | rxrpc: do not pull udp headers on receiveWillem de Bruijn2016-04-111-2/+2