summaryrefslogtreecommitdiffstats
path: root/net
Commit message (Expand)AuthorAgeFilesLines
* sctp: Guard IPV6 specific code properly.David S. Miller2011-06-061-1/+2
* net: Remove unnecessary semicolonsJoe Perches2011-06-053-4/+4
* af-packet: Use existing netdev reference for bound sockets.Ben Greear2011-06-051-12/+15
* af-packet: Hold reference to bound network devices.Ben Greear2011-06-051-5/+9
* Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-06-047-32/+49
|\
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6Linus Torvalds2011-06-0414-53/+95
| |\
| | * Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linvil...John W. Linville2011-06-032-20/+25
| | |\
| | | * bluetooth l2cap: fix locking in l2cap_global_chan_by_psmJohannes Berg2011-06-011-1/+1
| | | * cfg80211: don't drop p2p probe responsesEliad Peller2011-06-011-19/+24
| | * | net: tracepoint of net_dev_xmit sees freed skb and causes panicKoki Sanagi2011-06-021-2/+5
| | * | af-packet: Add flag to distinguish VID 0 from no-vlan.Ben Greear2011-06-011-3/+12
| | * | caif: Fix race when conditionally taking rtnl locksjur.brandeland@stericsson.com2011-06-011-6/+3
| | * | vlan: fix typo in vlan_dev_hard_start_xmit()Wei Yongjun2011-06-011-1/+1
| | * | net/ipv4: Check for mistakenly passed in non-IPv4 addressMarcus Meissner2011-06-011-0/+3
* | | | net: 8021q: Add pr_fmtJoe Perches2011-06-023-9/+14
* | | | sctp: Add ASCONF operation on the single-homed hostMichio Honda2011-06-025-7/+99
* | | | sctp: Add socket option operation for Auto-ASCONF.Michio Honda2011-06-021-0/+68
* | | | sctp: Add sysctl support for Auto-ASCONF.Michio Honda2011-06-021-0/+7
* | | | sctp: Add Auto-ASCONF support (core).Michio Honda2011-06-024-4/+206
* | | | sctp: Add ADD/DEL ASCONF handling at the receiver.Michio Honda2011-06-021-1/+1
* | | | Merge branch 'batman-adv/next' of git://git.open-mesh.org/ecsv/linux-mergeDavid S. Miller2011-05-3131-276/+284
|\ \ \ \
| * | | | batman-adv: Ensure that we really have route changes in update_routeSven Eckelmann2011-05-301-1/+1
| * | | | batman-adv: a multiline comment should precede the variable it is describingAntonio Quartulli2011-05-301-4/+4
| * | | | batman-adv: use is_broadcast_ether_addr() instead of compare_eth(.., brd_addr)Antonio Quartulli2011-05-301-1/+1
| * | | | batman-adv: Check type of x and y in seq_(before|after)Sven Eckelmann2011-05-301-2/+5
| * | | | batman-adv: move smallest_signed_int(), seq_before() and seq_after() into main.hAntonio Quartulli2011-05-302-16/+16
| * | | | batman-adv: Use rcu_dereference_protected by update-sideSven Eckelmann2011-05-303-3/+4
| * | | | batman-adv: Calculate sizeof using variable insead of typesSven Eckelmann2011-05-3014-72/+65
| * | | | batman-adv: Remove casts from type x to type xSven Eckelmann2011-05-302-2/+2
| * | | | batman-adv: Remove explicit casts cast from void* for storeSven Eckelmann2011-05-303-3/+3
| * | | | batman-adv: Only use int up and down gw representationSven Eckelmann2011-05-301-9/+10
| * | | | batman-adv: Add const type qualifier for pointersSven Eckelmann2011-05-3027-157/+166
| * | | | batman-adv: Don't do pointer arithmetic with void*Sven Eckelmann2011-05-301-2/+2
| * | | | batman-adv: Remove comparising < 0 for unsigned typeSven Eckelmann2011-05-301-1/+1
| * | | | batman-adv: Print jiffies as unsigned longSven Eckelmann2011-05-301-1/+1
| * | | | batman-adv: Annotate functions with format stringsSven Eckelmann2011-05-302-1/+3
| * | | | batman-adv: Use kzalloc rather than kmalloc followed by memset with 0Sven Eckelmann2011-05-301-2/+1
| * | | | batman-adv: move neigh_node->if_incoming->if_status check in find_router()Antonio Quartulli2011-05-302-3/+3
| |/ / /
* | | | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/ne...David S. Miller2011-05-317-21/+46
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | sctp: stop pending timers and purge queues when peer restart asocWei Yongjun2011-05-313-11/+29
| * | ip_options_compile: properly handle unaligned pointerChris Metcalf2011-05-311-7/+8
| |/
| * Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2....John W. Linville2011-05-273-3/+9
| |\
| | * mac80211: Remove duplicate linux/slab.h include from net/mac80211/scan.cJesper Juhl2011-05-271-1/+0
| | * mac80211: clear local->ps_data on disassocEliad Peller2011-05-271-0/+1
| | * mac80211: stop queues before rate control updationRajkumar Manoharan2011-05-261-0/+6
| | * nl80211: fix check for valid SSID size in scan operationsLuciano Coelho2011-05-261-2/+2
* | | Merge branch 'pnfs-submit' of git://git.open-osd.org/linux-open-osdLinus Torvalds2011-05-291-0/+19
|\ \ \
| * | | SUNRPC: introduce xdr_init_decode_pagesBenny Halevy2011-05-291-0/+19
* | | | Merge branch 'for-2.6.40' of git://linux-nfs.org/~bfields/linuxLinus Torvalds2011-05-291-148/+188
|\ \ \ \
| * | | | svcrpc: complete svsk processing on cb receive failureJ. Bruce Fields2011-04-101-4/+3