aboutsummaryrefslogtreecommitdiffstats
path: root/include/net
Commit message (Expand)AuthorAgeFilesLines
* Merge kernel.org linux-3.0.y into HEADKalimochoAz2012-10-312-1/+2
|\
| * ipvs: fix oops on NAT reply in br_nf contextLin Ming2012-10-211-1/+1
| * netfilter: nf_conntrack: fix racy timer handling with reliable eventsPablo Neira Ayuso2012-10-211-0/+1
* | Merge commit '2e54c4f' into HEADKalimochoAz2012-10-141-0/+3
|\ \ | |/
| * xfrm: Workaround incompatibility of ESN and async cryptoSteffen Klassert2012-10-131-0/+3
* | Merge commit 'b9a7985' into HEADKalimochoAz2012-10-141-0/+2
|\ \ | |/
| * tcp: Apply device TSO segment limit earlierBen Hutchings2012-10-021-0/+2
* | Merge remote-tracking branch 'android/android-3.0' into HEADKalimochoAz2012-09-161-4/+139
|\ \
| * | cfg80211: allow registering to beaconsJohannes Berg2012-08-241-0/+20
| * | nl80211: add API to probe a clientJohannes Berg2012-08-241-0/+17
| * | nl80211: allow subscribing to unexpected class3 framesJohannes Berg2012-08-241-0/+17
| * | nl80211: advertise device AP SMEJohannes Berg2012-08-241-0/+6
| * | nl80211: advertise GTK rekey support, new triggersJohannes Berg2012-08-241-4/+20
| * | nl80211: support sending TDLS commands/framesArik Nemtsov2012-08-241-0/+22
| * | cfg80211/nl80211: Add PMKSA caching candidate eventJouni Malinen2012-08-241-0/+11
| * | cfg80211/nl80211: support GTK rekey offloadJohannes Berg2012-08-241-0/+26
* | | Merge branch 'linux-3.0.y' into HEADKalimochoAz2012-07-272-3/+33
|\ \ \ | | |/ | |/|
| * | bonding: Fix corrupted queue_mappingEric Dumazet2012-07-161-2/+5
| * | cipso: handle CIPSO options correctly when NetLabel is disabledPaul Moore2012-07-161-1/+28
* | | Merge remote-tracking branch 'google/android-samsung-3.0-jb' into HEADKalimochoAz2012-07-201-1/+42
|\ \ \ | | |/ | |/|
| * | Merge commit 'v3.0.30' into android-3.0Todd Poynor2012-04-301-0/+1
| |\ \
| * \ \ Merge linux-stable 3.0.28 into android-3.0Todd Poynor2012-04-198-7/+76
| |\ \ \
| * | | | nl80211/cfg80211: add match filtering for sched_scanLuciano Coelho2012-03-131-0/+20
| * | | | nl80211/cfg80211: add max_sched_scan_ie_len in the hw descriptionLuciano Coelho2012-03-131-0/+3
| * | | | nl80211/cfg80211: add max_sched_scan_ssids in the hw descriptionLuciano Coelho2012-03-131-0/+3
| * | | | cfg80211: fix a crash in nl80211_send_stationFelix Fietkau2012-02-291-1/+3
| * | | | nl80211/cfg80211: Make addition of new sinfo fields saferJouni Malinen2012-01-241-0/+5
| * | | | cfg80211/nl80211: Send AssocReq IEs to user space in AP modeJouni Malinen2012-01-241-0/+8
* | | | | Merge branch 'linux-3.0.y' into HEADKalimochoAz2012-06-132-0/+14
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | sctp: check cached dst before using itNicolas Dichtel2012-06-101-0/+13
| * | | | ipv6: fix incorrect ipsec fragmentGao feng2012-06-101-0/+1
| | |_|/ | |/| |
* | | | Merge branch 'linux-3.0.y' into cmremoteKalimochoAz2012-04-251-0/+1
|\ \ \ \ | |/ / /
| * | | Bluetooth: hci_core: fix NULL-pointer dereference at unregisterJohan Hovold2012-04-221-0/+1
| | |/ | |/|
* | | Merge branch 'linux-3.0.y' into cm.icsKalimochoAz2012-03-014-1/+24
|\ \ \ | |/ /
| * | ipv4: reset flowi parameters on route connectJulian Anastasov2012-02-292-0/+14
| * | ipv4: Save nexthop address of LSRR/SSRR option to IPCB.Li Wei2012-02-291-0/+2
| * | net: Make qdisc_skb_cb upper size bound explicit.David S. Miller2012-02-291-1/+8
* | | Merge branch 'linux-3.0.y' into cm.ics.newKalimochoAz2012-02-202-3/+25
|\ \ \ | |/ /
| * | net: fix NULL dereferences in check_peer_redir()Eric Dumazet2012-02-132-3/+25
* | | Merge branch 'linux-3.0.update' into cm.ics.newKalimochoAz2012-02-113-3/+27
|\ \ \ | |/ / | | / | |/ |/|
| * netns: Fail conspicously if someone uses net_generic at an inappropriate time.Eric W. Biederman2012-02-031-0/+1
| * sctp: fix incorrect overflow check on autocloseXi Wang2012-01-061-0/+4
| * net: Handle different key sizes between address families in flow cachedpward2011-11-111-0/+19
| * net: Align AF-specific flowi structs to longDavid Ward2011-11-111-3/+3
* | Merge commit 'v3.0.8' into android-3.0Colin Cross2011-10-274-11/+52
|\ \ | |/
| * ipv6: fix NULL dereference in udp6_ufo_fragment()Jason Wang2011-10-161-1/+1
| * fs/9p: Use protocol-defined value for lock/getlock 'type' field.Jim Garlick2011-10-031-0/+5
| * fs/9p: Add OS dependent open flags in 9p protocolAneesh Kumar K.V2011-10-031-0/+24
| * ipv6: make fragment identifications less predictableEric Dumazet2011-08-152-11/+3
| * net: Compute protocol sequence numbers and fragment IDs using MD5.David S. Miller2011-08-151-0/+20