summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* netfilter: nfnetlink_queue: fix compilation with CONFIG_NF_NAT=m and CONFIG_N...Pablo Neira Ayuso2012-06-225-8/+18
* netfilter: nfq_ct_hook needs __rcu and __read_mostlyPablo Neira Ayuso2012-06-202-2/+2
* net: lpc_eth: Driver cleanupstigge@antcom.de2012-06-191-5/+1
* netfilter: fix missing symbols if CONFIG_NETFILTER_NETLINK_QUEUE_CT unsetPablo Neira Ayuso2012-06-181-1/+1
* Merge branch 'master' of git://1984.lsi.us.es/nf-nextDavid S. Miller2012-06-187-67/+187
|\
| * netfilter: nfnetlink_queue: fix compilation with NF_CONNTRACK disabledPablo Neira Ayuso2012-06-196-47/+164
| * netfilter: fix compilation of the nfnl_cthelper if NF_CONNTRACK is unsetPablo Neira Ayuso2012-06-192-9/+13
| * netfilter: nf_ct_helper: disable automatic helper re-assignment of different ...Pablo Neira Ayuso2012-06-191-1/+7
| * netfilter: ctnetlink: fix NULL dereference while trying to change helperPablo Neira Ayuso2012-06-191-10/+3
* | Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-mergeDavid S. Miller2012-06-1821-225/+420
|\ \ | |/ |/|
| * batman-adv: only store changed gw_bandwidth valuesMarek Lindner2012-06-181-0/+3
| * batman-adv: fix locking in hash_add()Matthias Schiffer2012-06-181-9/+6
| * batman-adv: use DBG_ALL in log_level sysfs definitionAntonio Quartulli2012-06-181-1/+1
| * batman-adv: turn tt commit code into routing protocol agnostic APIMarek Lindner2012-06-185-104/+118
| * batman-adv: fix visualization output without neighbors on the primary interfaceMatthias Schiffer2012-06-181-7/+14
| * batman-adv: don't bother flipping ->tt_crcAl Viro2012-06-182-9/+3
| * batman-adv: don't bother flipping ->tt_dataAl Viro2012-06-183-12/+10
| * batman-adv: Return error codes instead of -1 on failuresSven Eckelmann2012-06-1810-48/+58
| * batman-adv: keep batman_ogm_packet ->seqno net-endian all alongAl Viro2012-06-182-12/+12
| * batman-adv: trivial endianness annotationsAl Viro2012-06-182-9/+9
| * batman-adv: get rid of pointless cast in memcpy()Al Viro2012-06-181-1/+1
| * batman-adv: return added entries instead of number of possibly added entriesMarek Lindner2012-06-181-1/+1
| * batman-adv: ignore trailing CR when comparing protocol namesMarek Lindner2012-06-181-3/+8
| * batman-adv: avoid characters requiring shell escapes in protocol namesMarek Lindner2012-06-182-2/+2
| * batman-adv: Add get_ethtool_stats() supportMartin Hundebøll2012-06-188-3/+143
| * batman-adv: convert bat_priv->tt_crc from atomic_t to uint16_tAntonio Quartulli2012-06-183-4/+3
| * batman-adv: Initialize lockdep class keys for hashesSven Eckelmann2012-06-183-0/+26
| * batman-adv: fix skb->data assignmentAntonio Quartulli2012-06-181-0/+2
| * batman-adv: update internal version numberSven Eckelmann2012-06-181-1/+1
|/
* ipv4: Cap ADVMSS metric in the FIB rather than the routing cache.David S. Miller2012-06-172-3/+6
* net: lpc_eth: free skbs in start_xmitEric Dumazet2012-06-171-6/+5
* bnx2x: correct LPI pass-through configurationYuval Mintz2012-06-171-12/+6
* bnx2: Update version 2.2.2Michael Chan2012-06-161-2/+2
* bnx2: Read PCI function number from internal registerMichael Chan2012-06-162-2/+7
* bnx2: Dump additional BC_STATE during firmware sync timeout.Michael Chan2012-06-162-0/+3
* bnx2: Dump all FTQ_CTL registers during tx_timeoutMichael Chan2012-06-162-0/+112
* Merge branch 'master' of git://1984.lsi.us.es/nf-nextDavid S. Miller2012-06-1639-183/+1237
|\
| * netfilter: add user-space connection tracking helper infrastructurePablo Neira Ayuso2012-06-1612-26/+839
| * netfilter: ctnetlink: add CTA_HELP_INFO attributePablo Neira Ayuso2012-06-163-5/+20
| * netfilter: nfnetlink_queue: add NAT TCP sequence adjustment if packet mangledPablo Neira Ayuso2012-06-165-8/+34
| * netfilter: add glue code to integrate nfnetlink_queue and ctnetlinkPablo Neira Ayuso2012-06-165-1/+208
| * netfilter: nf_ct_helper: implement variable length helper private dataPablo Neira Ayuso2012-06-1617-106/+111
| * netfilter: nf_ct_ext: support variable length extensionsPablo Neira Ayuso2012-06-162-10/+15
| * netfilter: nf_ct_helper: allocate 16 bytes for the helper and policy namesPablo Neira Ayuso2012-06-167-31/+14
* | include/net/dst.h: neaten asterisk placementEldad Zack2012-06-161-9/+8
* | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-06-163-24/+12
|\ \
| * | Revert "ipv6: Prevent access to uninitialized fib_table_hash via /proc/net/ip...David S. Miller2012-06-163-24/+12
* | | ipv6: Fix types of ip6_update_pmtu().David S. Miller2012-06-151-2/+2
* | | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/netDavid S. Miller2012-06-15310-2200/+4361
|\ \ \ | |/ /
| * | ipv6: Prevent access to uninitialized fib_table_hash via /proc/net/ipv6_routeThomas Graf2012-06-153-12/+24
OpenPOWER on IntegriCloud