summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'skb_checksum_help'David S. Miller2014-01-144-302/+281
|\
| * xen-netfront: use new skb_checksum_setup functionPaul Durrant2014-01-141-45/+3
| * xen-netback: use new skb_checksum_setup functionPaul Durrant2014-01-141-257/+3
| * net: add skb_checksum_setupPaul Durrant2014-01-142-0/+275
|/
* bridge: move br_net_exit() to br.cWANG Cong2014-01-143-19/+18
* net: 3com: fix warning for incorrect type in argumentdingtianhong2014-01-141-1/+1
* net: qlcnic: fix warning for incorrect type in argumentdingtianhong2014-01-141-1/+1
* sh_eth: fix garbled TX error messageSergei Shtylyov2014-01-141-4/+4
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klasse...David S. Miller2014-01-148-48/+139
|\
| * {xfrm,pktgen} Fix compiling error when CONFIG_XFRM is not setFan Du2014-01-101-2/+2
| * pktgen_dst_metrics[] can be staticFengguang Wu2014-01-061-1/+1
| * {pktgen, xfrm} Document IPsec usage in pktgen.txtFan Du2014-01-031-0/+15
| * {pktgen, xfrm} Show spi value properly when ipsec turned onFan Du2014-01-031-1/+4
| * {pktgen, xfrm} Introduce xfrm_state_lookup_byspi for pktgenFan Du2014-01-033-7/+39
| * {pktgen, xfrm} Construct skb dst for tunnel mode transformationFan Du2014-01-031-1/+27
| * {pktgen, xfrm} Using "pgset spi xxx" to spedifiy SA for a given flowFan Du2014-01-031-0/+12
| * {pktgen, xfrm} Correct xfrm_state_lock usage in xfrm_stateonly_findFan Du2014-01-031-2/+2
| * {pktgen, xfrm} Add statistics counting when transformingFan Du2014-01-031-3/+7
| * {pktgen, xfrm} Correct xfrm state lock usage when transformingFan Du2014-01-031-3/+2
| * xfrm: checkpatch erros with inline keyword positionWeilong Chen2014-01-021-3/+3
| * xfrm: fix checkpatch errorWeilong Chen2014-01-021-2/+2
| * xfrm: checkpatch erros with space prohibitedWeilong Chen2014-01-022-4/+4
| * xfrm: checkpatch errors with foo * barWeilong Chen2014-01-023-13/+13
| * xfrm: checkpatch errors with spaceWeilong Chen2014-01-024-13/+13
* | Merge branch 'bonding_rcu'David S. Miller2014-01-141-18/+19
|\ \
| * | bonding: fix __get_active_agg() RCU logicVeaceslav Falico2014-01-141-6/+4
| * | bonding: fix __get_first_agg RCU usageVeaceslav Falico2014-01-141-1/+4
| * | bonding: fix bond_3ad_set_carrier() RCU usageVeaceslav Falico2014-01-141-11/+11
|/ /
* | Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2014-01-1443-768/+1652
|\ \
| * | batman-adv: drop dependency against CRC16Antonio Quartulli2014-01-121-1/+0
| * | batman-adv: Start new development cycleSimon Wunderlich2014-01-121-1/+1
| * | batman-adv: update copyright years for 2014Simon Wunderlich2014-01-1241-41/+41
| * | batman-adv: add build checks for packet sizesSimon Wunderlich2014-01-121-7/+17
| * | batman-adv: add missing sysfs attributes to READMEAntonio Quartulli2014-01-121-5/+4
| * | batman-adv: remove returns at the end of void functionsAntonio Quartulli2014-01-121-7/+0
| * | batman-adv: add debugfs support to view multiif tablesSimon Wunderlich2014-01-125-7/+73
| * | batman-adv: add debugfs structure for information per interfaceSimon Wunderlich2014-01-124-0/+86
| * | batman-adv: add bonding againSimon Wunderlich2014-01-124-4/+121
| * | batman-adv: consider outgoing interface in OGM sendingSimon Wunderlich2014-01-123-64/+115
| * | batman-adv: add WiFi penaltySimon Wunderlich2014-01-123-6/+24
| * | batman-adv: split out router from orig_nodeSimon Wunderlich2014-01-1211-219/+605
| * | batman-adv: split tq information in neigh_node structSimon Wunderlich2014-01-129-114/+588
| * | batman-adv: remove bonding and interface alternatingSimon Wunderlich2014-01-125-327/+12
* | | net: resort some Kbuild files to hopefully help avoid some conflictsStephen Rothwell2014-01-146-6/+6
* | | Merge branch 'qlcnic'David S. Miller2014-01-1412-63/+184
|\ \ \
| * | | qlcnic: Update version to 5.3.54Shahed Shaikh2014-01-141-2/+2
| * | | qlcnic: Enable IPv6 LRO even if IP address is not programmedShahed Shaikh2014-01-141-2/+2
| * | | qlcnic: Fix SR-IOV cleanup code pathManish Chopra2014-01-141-3/+1
| * | | qlcnic: Enable beaconing for 83xx/84xx Series adapter.Himanshu Madhani2014-01-147-24/+70
| * | | qlcnic: Do MAC learning for SRIOV PF.Sucheta Chakraborty2014-01-146-31/+64