summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* netfilter: use IS_ENABLED() macroDuan Jiong2014-06-3014-17/+25
* netfilter: nft_log: fix coccinelle warningsFengguang Wu2014-06-291-1/+1
* netfilter: xt_LOG: add missing string format in nf_log_packet()Pablo Neira Ayuso2014-06-281-1/+1
* netfilter: fix several Kconfig problems in NF_LOG_*Pablo Neira Ayuso2014-06-283-21/+19Star
* netfilter: nft_log: complete logging supportPablo Neira Ayuso2014-06-272-17/+63
* netfilter: nft_log: request explicit logger when loading rulesPablo Neira Ayuso2014-06-271-1/+23
* netfilter: bridge: add generic packet loggerPablo Neira Ayuso2014-06-276-43/+115
* netfilter: add generic ARP packet loggerPablo Neira Ayuso2014-06-273-0/+155
* netfilter: log: nf_log_packet() as real unified interfacePablo Neira Ayuso2014-06-276-41/+73
* netfilter: log: split family specific code to nf_log_{ip,ip6,common}.c filesPablo Neira Ayuso2014-06-2711-874/+1047
* netfilter: nf_log: move log buffering to core loggingPablo Neira Ayuso2014-06-254-201/+217
* netfilter: nf_log: use an array of loggers instead of listPablo Neira Ayuso2014-06-255-32/+37
* netfilter: kill ulog targetsPablo Neira Ayuso2014-06-258-1015/+0Star
* netfilter: conntrack: remove timer from ecache extensionFlorian Westphal2014-06-254-72/+124
* netfilter: x_tables: xt_free_table_info() cleanupEric Dumazet2014-06-251-18/+5Star
* netfilter: ctnetlink: remove null test before kfreeFabian Frederick2014-06-251-2/+1Star
* cxgb4: Fix endian bug introduced in cxgb4 dcb patchsetAnish Bhatt2014-06-241-4/+4
* trivial: net/irda/irlmp.c: Fix closing brace followed by ifRasmus Villemoes2014-06-241-1/+2
* enic: Kill unused variable in enic_rfs_flw_tbl_init().David S. Miller2014-06-231-1/+1
* Merge branch 'enic'David S. Miller2014-06-2317-104/+786
|\
| * enic: do tx cleanup in napi pollGovindarajulu Varadarajan2014-06-232-36/+54
| * enic: add low latency socket busy_poll supportGovindarajulu Varadarajan2014-06-232-12/+195
| * enic: fix lockdep around devcmd_lockTony Camuso2014-06-234-52/+52
| * enic: Add Accelerated RFS supportGovindarajulu Varadarajan2014-06-236-0/+279
| * enic: alloc/free rx_cpu_rmapGovindarajulu Varadarajan2014-06-231-0/+43
| * enic: devcmd for adding IP 5 tuple hardware filtersGovindarajulu Varadarajan2014-06-236-1/+145
| * enic: fix return value in _vnic_dev_cmdGovindarajulu Varadarajan2014-06-231-2/+2
| * flow_keys: Record IP layer protocol in skb_flow_dissect()Govindarajulu Varadarajan2014-06-233-1/+16
|/
* Merge branch 'cc2520'David S. Miller2014-06-235-0/+1106
|\
| * devicetree: add device tree bindings for cc2520 driverVarka Bhadram2014-06-231-0/+29
| * ieee802154: cc2520: add driver to kernel build systemVarka Bhadram2014-06-232-0/+12
| * ieee802154: cc2520: adds driver for TI CC2520 radioVarka Bhadram2014-06-232-0/+1065
|/
* Merge branch 'cxgb4-next'David S. Miller2014-06-2315-44/+1492
|\
| * cxgb4 : Update copyright year on all cxgb4 filesAnish Bhatt2014-06-2311-11/+11
| * cxgb4 : Makefile & Kconfig changes for DCBx supportAnish Bhatt2014-06-232-0/+12
| * cxgb4 : Integrate DCBx support into cxgb4 module. Register dbcnl_ops to give ...Anish Bhatt2014-06-233-14/+272
| * cxgb4 : Add DCBx support codebase and dcbnl_opsAnish Bhatt2014-06-232-0/+1121
| * cxgb4 : Update fw interface file for DCBx support. Adds all the required fiel...Anish Bhatt2014-06-231-19/+76
|/
* xilinx: Fix compiler warningManuel Schölling2014-06-233-3/+3
* net: em_canid: remove useless statements from em_canid_changeDuan Jiong2014-06-221-7/+0Star
* bridge: use list_for_each_entry_continue_reverseLi RongQing2014-06-221-6/+4Star
* Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsh...David S. Miller2014-06-2112-6379/+3954Star
|\
| * i40e/i40evf: Bump i40e to 0.4.13 and i40evf to 0.9.35Catherine Sullivan2014-06-202-2/+2
| * i40e/i40evf: modify debug prints to avoid seg faultsKamil Krawczyk2014-06-202-8/+22
| * i40e/i40evf: Update RSS configurationCarolyn Wyborny2014-06-205-7/+21
| * i40evf: fix off-by-oneMitch Williams2014-06-201-2/+2
| * i40e: keep service tasks out of reset processShannon Nelson2014-06-201-0/+6
| * i40e: clear VEB stats when pf stats are clearedShannon Nelson2014-06-201-0/+12
| * i40e: Fix scheduling while atomic bug during NAPINeerav Parikh2014-06-202-2/+24
| * i40e: debugfs fix to dump remote LLDPDUNeerav Parikh2014-06-201-1/+1