aboutsummaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* netfilter: xt_IDLETIMER: Rename INTERFACE to LABEL in netlink notification.Ashish Sharma2012-08-301-6/+6
* Merge branch 'linux-3.0.y' into HEADKalimochoAz2012-07-2712-21/+56
|\
| * cfg80211: check iface combinations only when iface is runningMichal Kazior2012-07-191-1/+1
| * tcp: drop SYN+FIN messagesEric Dumazet2012-07-191-0/+2
| * mac80211: correct behaviour on unrecognised action framesJohannes Berg2012-07-161-1/+4
| * cfg80211: fix potential deadlock in regulatoryEliad Peller2012-07-161-1/+1
| * netpoll: fix netpoll_send_udp() bugsEric Dumazet2012-07-161-5/+6
| * ipv6: Move ipv6 proc file registration to end of init orderThomas Graf2012-07-161-10/+31
| * bridge: Assign rtnl_link_ops to bridge devices created via ioctl (v2)stephen hemminger2012-07-163-1/+3
| * ethtool: allow ETHTOOL_GSSET_INFO for usersMichał Mirosław2012-07-161-0/+1
| * net: l2tp_eth: fix kernel panic on rmmod l2tp_ethEric Dumazet2012-07-161-0/+2
| * net: sock: validate data_len before allocating skb in sock_alloc_send_pskb()Jason Wang2012-07-161-2/+5
* | Merge remote-tracking branch 'google/android-samsung-3.0-jb' into HEADKalimochoAz2012-07-208-69/+415
|\ \
| * \ Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip...JP Abgrall2012-05-102-5/+9
| |\ \
| | * | ipv6: check return value for dst_allocMadalin Bucur2012-05-091-1/+3
| | * | net: check return value for dst_allocMadalin Bucur2012-05-091-4/+6
| * | | Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip...JP Abgrall2012-05-082-13/+19
| |\ \ \ | | |/ /
| | * | Merge commit 'v3.0.31' into android-3.0Todd Poynor2012-05-082-13/+19
| | |\ \
| * | \ \ Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip...JP Abgrall2012-05-074-113/+253
| |\ \ \ \ | | |/ / /
| | * | | netfilter: xt_qtaguid: start tracking iface rx/tx at low levelJP Abgrall2012-05-043-67/+233
| | * | | netfilter: xt_IDLETIMER: Use uevent instead of new netlink msg typeJP Abgrall2012-05-041-46/+20
| * | | | Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip...JP Abgrall2012-05-0416-131/+70
| |\ \ \ \ | | |/ / /
| | * | | Merge commit 'v3.0.30' into android-3.0Todd Poynor2012-04-3016-131/+70
| | |\ \ \
| * | \ \ \ Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip...JP Abgrall2012-04-2494-476/+895
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge linux-stable 3.0.28 into android-3.0Todd Poynor2012-04-1994-476/+895
| | |\ \ \ \
| * | \ \ \ \ Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip...JP Abgrall2012-04-181-8/+44
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | netfilter: xt_qtaguid: fix ipv6 protocol lookupJP Abgrall2012-04-171-7/+32
| | * | | | | netfilter: qtaguid: initialize a local var to keep compiler happy.JP Abgrall2012-04-171-1/+12
| * | | | | | Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip...JP Abgrall2012-04-051-7/+98
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | xt_IDLETIMER:Ashish Sharma2012-04-051-7/+98
| * | | | | | Merge branch 'android-3.0' into android-samsung-3.0-wipDmitry Shmidt2012-03-141-3/+72
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | nl80211/cfg80211: add match filtering for sched_scanLuciano Coelho2012-03-131-1/+66
| | * | | | | nl80211/cfg80211: add max_sched_scan_ie_len in the hw descriptionLuciano Coelho2012-03-131-1/+3
| | * | | | | nl80211/cfg80211: add max_sched_scan_ssids in the hw descriptionLuciano Coelho2012-03-131-1/+3
| * | | | | | Merge branch 'android-3.0' into android-samsung-3.0-wipDmitry Shmidt2012-02-291-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | cfg80211: fix a crash in nl80211_send_stationFelix Fietkau2012-02-291-1/+1
| * | | | | | Merge remote-tracking branch 'common/android-3.0' into android-samsung-30-wip...JP Abgrall2012-02-062-0/+6
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | nl80211/cfg80211: Make addition of new sinfo fields saferJouni Malinen2012-01-242-0/+2
| | * | | | | cfg80211/nl80211: Send AssocReq IEs to user space in AP modeJouni Malinen2012-01-241-0/+4
* | | | | | | Merge branch 'linux-3.0.y' into HEADKalimochoAz2012-06-241-1/+2
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | NFSv4.1: Fix a request leak on the back channelTrond Myklebust2012-06-221-1/+2
* | | | | | | Merge branch 'linux-3.0.y' into HEADKalimochoAz2012-06-213-1/+46
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | cfg80211: fix interface combinations checkJohannes Berg2012-06-171-1/+18
| * | | | | | mac80211: clean up remain-on-channel on interface stopJohannes Berg2012-06-172-0/+28
* | | | | | | Merge branch 'linux-3.0.y' into HEADKalimochoAz2012-06-1314-117/+139
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | xfrm: take net hdr len into account for esp payload size calculationBenjamin Poirier2012-06-102-26/+16
| * | | | | | sctp: check cached dst before using itNicolas Dichtel2012-06-102-20/+1
| * | | | | | Revert "net: maintain namespace isolation between vlan and real device"David S. Miller2012-06-102-32/+6
| * | | | | | pktgen: fix module unload for goodEric Dumazet2012-06-101-2/+2
| * | | | | | pktgen: fix crash at module unloadEric Dumazet2012-06-101-2/+8