summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* 8021q: fix vlan device to inherit the unicast filtering capability flagYi Zou2012-11-301-0/+1
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/...David S. Miller2012-11-3011-125/+296
|\
| * openvswitch: Use RCU callback when detaching netdevices.Jesse Gross2012-11-282-4/+13
| * openvswitch: add skb mark matching and set actionAnsis Atteka2012-11-264-4/+30
| * net: openvswitch: use this_cpu_ptr per-cpu helperShan Wei2012-11-162-5/+4
| * openvswitch: add ipv6 'set' actionAnsis Atteka2012-11-132-0/+113
| * ipv6: improve ipv6_find_hdr() to skip empty routing headersAnsis Atteka2012-11-121-8/+28
| * ipv6: Move ipv6_find_hdr() out of Netfilter code.Jesse Gross2012-11-093-107/+107
| * openvswitch: Process RARP packets with ethertype 0x8035 similar to ARP packets.Mehak Mahajan2012-11-021-3/+6
* | core: make GRO methods static.Rami Rosen2012-11-291-6/+3
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-11-2910-21/+34
|\ \
| * \ Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jesse/o...David S. Miller2012-11-282-10/+6
| |\ \ | | |/
| | * openvswitch: Store flow key len if ARP opcode is not request or reply.Mehak Mahajan2012-10-301-9/+5
| | * openvswitch: Print device when warning about over MTU packets.Jesse Gross2012-10-301-1/+1
| * | Merge branch 'master' of git://1984.lsi.us.es/nfDavid S. Miller2012-11-281-1/+1
| |\ \
| | * | netfilter: ipset: fix netiface set name overflowFlorian Westphal2012-11-241-1/+1
| * | | irda: irttp: fix memory leak in irttp_open_tsap() error pathTommi Rantala2012-11-281-0/+1
| * | | sctp: Error in calculation of RTTvarSchoch Christian2012-11-281-1/+1
| * | | sctp: fix -ENOMEM result with invalid user space pointer in sendto() syscallTommi Rantala2012-11-282-6/+11
| * | | sctp: fix memory leak in sctp_datamsg_from_user() when copy from user space f...Tommi Rantala2012-11-281-2/+5
| * | | net: ipmr: limit MRT_TABLE identifiersEric Dumazet2012-11-261-0/+4
| * | | ipv4: avoid passing NULL to inet_putpeer() in icmpv4_xrlim_allow()Neal Cardwell2012-11-261-1/+2
| * | | can: bcm: initialize ifindex for timeouts without previous frame receptionOliver Hartkopp2012-11-261-0/+3
| |/ /
* | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2012-11-2866-1521/+3960
|\ \ \
| * \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-11-2866-1521/+3960
| |\ \ \
| | * \ \ Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-2637-885/+1237
| | |\ \ \
| | | * | | cfg80211: fix some tracing output issuesJohannes Berg2012-11-261-76/+73
| | | * | | mac80211: support VHT rates in TX infoJohannes Berg2012-11-261-17/+24
| | | * | | mac80211: support drivers reporting VHT RXJohannes Berg2012-11-264-9/+55
| | | * | | nl80211/cfg80211: add VHT MCS supportJohannes Berg2012-11-262-16/+116
| | | * | | mac80211: convert to channel definition structJohannes Berg2012-11-2617-234/+189
| | | * | | nl80211/cfg80211: support VHT channel configurationJohannes Berg2012-11-2610-94/+382
| | | * | | cfg80211: pass a channel definition structJohannes Berg2012-11-2613-328/+312
| | | * | | cfg80211: remove remain-on-channel channel typeJohannes Berg2012-11-2612-126/+63
| | | * | | mac80211: fix managed mode channel flags handlingJohannes Berg2012-11-261-9/+5
| | | * | | mac80211: remove mesh config macros from mesh_plink.cMarco Porsch2012-11-261-15/+13
| | | * | | mac80211: refactor ieee80211_set_qos_hdrMarco Porsch2012-11-261-17/+23
| | | * | | mac80211: move Mesh Capability field definition to ieee80211.hMarco Porsch2012-11-263-19/+5
| | | * | | mac80211: in ADHOC print debug message for every Auth messageAntonio Quartulli2012-11-261-2/+4
| | | * | | mac80211: in ADHOC don't update last_rx if sta is not authorizedAntonio Quartulli2012-11-261-3/+7
| | | * | | cfg80211: change function signature of cfg80211_get_p2p_attr()Arend van Spriel2012-11-261-2/+3
| | | * | | cfg80211: use DS or HT operation IEs to determine BSS channelJohannes Berg2012-11-232-9/+45
| | | * | | mac80211: disable HT advertising unless AP supports itJohannes Berg2012-11-231-0/+1
| | | * | | mac80211: rename IEEE80211_STA_DISABLE_11N to HTJohannes Berg2012-11-232-9/+9
| | | * | | mac80211: fix RX chains configurationJohannes Berg2012-11-231-16/+21
| | | * | | mac80211: fix radiotap vendor area skippingJohannes Berg2012-11-231-4/+7
| | * | | | Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jber...John W. Linville2012-11-2121-138/+378
| | |\ \ \ \ | | | |/ / /
| | | * | | mac80211: Add debugfs callbacks for station addition/removalSujith Manoharan2012-11-212-0/+41
| | | * | | mac80211: fix channel context suspend/reconfig handlingJohannes Berg2012-11-202-3/+56
| | | * | | mac80211: make remain_on_channel() op pass vif paramEliad Peller2012-11-194-10/+18
OpenPOWER on IntegriCloud