summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* vlan: make a new function vlan_dev_vlan_proto() and exportdingtianhong2014-03-261-0/+6
* net: Rename skb->rxhash to skb->hashTom Herbert2014-03-264-14/+14
* tcp: delete unused parameter in tcp_nagle_check()Peter Pan(潘卫平)2014-03-261-3/+3
* Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2014-03-269-53/+63
|\
| * tipc: fix spinlock recursion bug for failed subscriptionsErik Hugne2014-03-241-14/+15
| * netpoll: fix the skb check in pkt_is_nsLi RongQing2014-03-241-1/+1
| * Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/o...David S. Miller2014-03-202-5/+7
| |\
| | * openvswitch: Correctly report flow used times for first 5 minutes after boot.Ben Pfaff2014-03-201-1/+1
| | * openvswitch: Fix race.Jarno Rajahalme2014-02-161-3/+4
| | * openvswitch: Read tcp flags only then the tranport header is present.Jarno Rajahalme2014-02-161-0/+1
| | * ovs: fix dp check in ovs_dp_reset_user_featuresJiri Pirko2014-02-161-1/+1
| * | ip6mr: fix mfc notification flagsNicolas Dichtel2014-03-201-5/+8
| * | ipmr: fix mfc notification flagsNicolas Dichtel2014-03-201-5/+8
| * | rtnetlink: fix fdb notification flagsNicolas Dichtel2014-03-201-4/+6
| * | ipv6: ip6_append_data_mtu do not handle the mtu of the second fragment properlylucien2014-03-181-8/+6Star
| * | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2014-03-182-12/+13
| |\ \
| | * | selinux: add gfp argument to security_xfrm_policy_alloc and fix callersNikolay Aleksandrov2014-03-102-6/+6
| | * | net: af_key: fix sleeping under rcuNikolay Aleksandrov2014-03-101-6/+7
* | | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2014-03-2646-392/+989
|\ \ \ \
| * \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2014-03-2146-392/+989
| |\ \ \ \
| | * \ \ \ Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/...John W. Linville2014-03-2015-183/+360
| | |\ \ \ \
| | | * | | | Bluetooth: Enforce strict Secure Connections Only mode securityMarcel Holtmann2014-03-192-0/+23
| | | * | | | Bluetooth: Fix Pair Device response parameters for pairing failureJohan Hedberg2014-03-191-2/+14
| | | * | | | Bluetooth: Fix SMP user passkey notification mgmt eventJohan Hedberg2014-03-191-2/+3
| | | * | | | Bluetooth: Increase SMP re-encryption delay to 500msJohan Hedberg2014-03-191-1/+1
| | | * | | | Bluetooth: Simplify logic when checking SMP_FLAG_TK_VALIDJohan Hedberg2014-03-191-4/+2Star
| | | * | | | Bluetooth: Fix MITM flag when initiating SMP pairingJohan Hedberg2014-03-181-0/+6
| | | * | | | Bluetooth: Fix smp_e byte order to be consistent with SMP specificationJohan Hedberg2014-03-181-55/+46Star
| | | * | | | Bluetooth: Fix const declaration for swap function src parameterJohan Hedberg2014-03-181-2/+2
| | | * | | | Bluetooth: Fix updating SMP remote key distribution informationJohan Hedberg2014-03-141-0/+5
| | | * | | | Bluetooth: make sure 6LOWPAN_IPHC is built-in if neededArnd Bergmann2014-03-131-1/+1
| | | * | | | Bluetooth: Convert uses of __constant_<foo> to <foo>Joe Perches2014-03-1211-96/+96
| | | * | | | Bluetooth: Enable duplicates filter in background scanAndre Guedes2014-03-111-5/+7
| | | * | | | Bluetooth: Fix aborting eSCO connection in case of error 0x20Andrew Earl2014-03-111-0/+1
| | | * | | | Bluetooth: make bluetooth 6lowpan as an optionAlexander Aring2014-03-113-2/+30
| | | * | | | Bluetooth: Make LTK and CSRK only persisent when bondingMarcel Holtmann2014-03-102-8/+17
| | | * | | | Bluetooth: Add support for handling signature resolving keysMarcel Holtmann2014-03-093-5/+94
| | | * | | | Bluetooth: Fix skb allocation check for A2MPGustavo Padovan2014-03-071-1/+7
| | | * | | | Bluetooth: Fix expected key count debug logsJohan Hedberg2014-03-071-3/+3
| | | * | | | Bluetooth: Fix removing Long Term KeyClaudio Takahasi2014-03-051-1/+7
| | * | | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2014-03-2022-176/+298
| | |\ \ \ \ \
| | | * | | | | cfg80211: remove macro ASSERT_RDEV_LOCK(rdev)Zhao, Gang2014-03-194-5/+2Star
| | | * | | | | cfg80211: remove unnecessary checkZhao, Gang2014-03-191-3/+0Star
| | | * | | | | mac80211: set beamforming bit in radiotapEmmanuel Grumbach2014-03-191-0/+2
| | | * | | | | cfg80211/mac80211: ignore signal if the frame was heard on wrong channelEmmanuel Grumbach2014-03-193-29/+23Star
| | | * | | | | cfg80211: make __cfg80211_join_ibss() staticZhao, Gang2014-03-192-8/+4Star
| | | * | | | | mac80211: release sched_scan_sdata when stopping sched scanAlexander Bondar2014-03-191-2/+4
| | | * | | | | mac80211: fix WPA with VLAN on AP side with ps-sta againMichael Braun2014-03-191-1/+1
| | | * | | | | mac80211: fix suspend vs. authentication raceJohannes Berg2014-03-193-3/+38
| | | * | | | | mac80211: verify deauthentication and return error on failureJohannes Berg2014-03-191-13/+17