summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-02-108-18/+24
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netLinus Torvalds2012-02-1018-59/+59
| |\
| | * net: Don't proxy arp respond if iif == rt->dst.dev if private VLAN is disabledThomas Graf2012-02-101-1/+2
| | * ipv4: Fix wrong order of ip_rt_get_source() and update iph->daddr.Li Wei2012-02-101-1/+1
| | * netprio_cgroup: fix wrong memory access when NETPRIO_CGROUP=mNeil Horman2012-02-101-5/+2
| | * netprio_cgroup: don't allocate prio table when a device is registeredNeil Horman2012-02-101-6/+0
| | * netprio_cgroup: fix an off-by-one bugNeil Horman2012-02-101-1/+1
| | * net: Make qdisc_skb_cb upper size bound explicit.David S. Miller2012-02-094-9/+5
| | * gro: more generic L2 header checkEric Dumazet2012-02-081-2/+8
| | * net: Fix build regression when INET_UDP_DIAG=y and IPV6=mAnisse Astier2012-02-071-1/+1
| | * tcp_v4_send_reset: binding oif to iif in no sock caseShawn Lu2012-02-041-0/+5
| * | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/sag...Linus Torvalds2012-02-022-3/+12
| |\ \
| | * | ceph: initialize client debugfs outside of monc->mutexSage Weil2012-02-022-3/+12
* | | | af_iucv: allow retrieval of maximum message sizeUrsula Braun2012-02-081-1/+9
* | | | af_iucv: change net_device handling for HS transportUrsula Braun2012-02-081-57/+62
* | | | af_iucv: block writing if msg limit is exceededUrsula Braun2012-02-081-1/+1
* | | | af_iucv: remove IUCV-pathes completelyUrsula Braun2012-02-081-34/+37
* | | | ipv6: Implement IPV6_UNICAST_IF socket option.Erich E. Hoover2012-02-084-1/+42
* | | | ipv4: Implement IP_UNICAST_IF socket option.Erich E. Hoover2012-02-084-3/+39
* | | | gro: more generic L2 header checkEric Dumazet2012-02-081-2/+8
* | | | caif: remove duplicate initializationDan Carpenter2012-02-071-2/+1
* | | | net/sched: sch_plug - Queue traffic until an explicit release commandShriram Rajagopalan2012-02-073-0/+260
* | | | Merge branch 'tipc_net-next' of git://git.kernel.org/pub/scm/linux/kernel/git...David S. Miller2012-02-077-260/+255
|\ \ \ \
| * | | | tipc: Minor optimization to rejection of connection-based messagesAllan Stephens2012-02-061-2/+3
| * | | | tipc: Eliminate alteration of publication key during name table purgingAllan Stephens2012-02-061-4/+0
| * | | | tipc: Prevent loss of fragmented messages over broadcast linkAllan Stephens2012-02-061-22/+42
| * | | | tipc: Prevent loss of fragmented messages over unicast linksAllan Stephens2012-02-061-3/+10
| * | | | tipc: Remove obsolete broadcast tag capabilityAllan Stephens2012-02-063-9/+1
| * | | | tipc: Major redesign of broadcast link ACK/NACK algorithmsAllan Stephens2012-02-065-165/+100
| * | | | tipc: Add missing locks in broadcast link statistics accumulationAllan Stephens2012-02-061-0/+11
| * | | | tipc: Fix bug in broadcast link duplicate message statisticsAllan Stephens2012-02-061-0/+2
| * | | | tipc: Fix node lock reclamation issues in broadcast link receptionAllan Stephens2012-02-061-18/+40
| * | | | tipc: Add missing broadcast link lock when sending NACKAllan Stephens2012-02-061-0/+2
| * | | | tipc: Fix problem with broadcast link synchronization between nodesAllan Stephens2012-02-061-2/+5
| * | | | tipc: Ensure broadcast link re-acquires node after link failureAllan Stephens2012-02-063-4/+8
| * | | | tipc: Prevent broadcast link stalling in dual LAN environmentsAllan Stephens2012-02-061-4/+5
| * | | | tipc: Prevent transmission of outdated link protocol messagesAllan Stephens2012-02-061-26/+27
| * | | | tipc: improve the link deferred queue insertion algorithmAllan Stephens2012-02-061-25/+23
* | | | | Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/lin...David S. Miller2012-02-0631-304/+868
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2012-02-0631-304/+868
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | mac80211: Move num_sta_ps counter decrement after synchronize_rcuHelmut Schaa2012-01-301-9/+9
| | * | | | mac80211: add support for mcs masksSimon Wunderlich2012-01-306-9/+167
| | * | | | nl80211: add support for mcs masksSimon Wunderlich2012-01-301-1/+60
| | * | | | mac80211: Fix incorrect num_sta_ps decrement in ap_sta_ps_endHelmut Schaa2012-01-302-7/+5
| | * | | | mac80211: Fix incorrect num_sta_ps decrement in __sta_info_destroyHelmut Schaa2012-01-301-3/+1
| | * | | | mac80211: station state transition error handlingJohannes Berg2012-01-308-39/+59
| | * | | | Revert "mac80211: Do not scan for IBSS merge with a fixed BSSID."John W. Linville2012-01-301-3/+2
| | * | | | mac80211: Do not scan for IBSS merge with a fixed BSSID.Nicolas Cavallari2012-01-271-2/+3
| | * | | | mac80211: send null packet on active (psm) reconfigurationEliad Peller2012-01-271-0/+15
| | * | | | nfc: NULL vs zero in nci_activate_target()Dan Carpenter2012-01-271-1/+1