1. 20 6月, 2012 35 次提交
  2. 19 6月, 2012 5 次提交
    • S
      net: lpc_eth: Driver cleanup · b31525d1
      stigge@antcom.de 提交于
      This patch removes some nowadays superfluous definitions (one unused define and
      an obsolete function forward declaration) and corrects a netdev_err() to
      netdev_dbg().
      Signed-off-by: NRoland Stigge <stigge@antcom.de>
      Signed-off-by: NAlexandre Pereira da Silva <aletes.xgr@gmail.com>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      b31525d1
    • P
      netfilter: fix missing symbols if CONFIG_NETFILTER_NETLINK_QUEUE_CT unset · 674147e2
      Pablo Neira Ayuso 提交于
      ERROR: "nfqnl_ct_parse" [net/netfilter/nfnetlink_queue.ko] undefined!
      ERROR: "nfqnl_ct_seq_adjust" [net/netfilter/nfnetlink_queue.ko] undefined!
      ERROR: "nfqnl_ct_put" [net/netfilter/nfnetlink_queue.ko] undefined!
      ERROR: "nfqnl_ct_get" [net/netfilter/nfnetlink_queue.ko] undefined!
      
      We have to use CONFIG_NETFILTER_NETLINK_QUEUE_CT in
      include/net/netfilter/nfnetlink_queue.h, not CONFIG_NF_CONNTRACK.
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      674147e2
    • D
      Merge branch 'master' of git://1984.lsi.us.es/nf-next · 6bdc5f49
      David S. Miller 提交于
      Pablo says:
      
      ====================
      The following patchset provides fixes for issues that were recently introduced
      by my new cthelper infrastructure. They have been spotted by Randy Dunlap,
      Andrew Morton and Dan Carpenter.
      
      The patches provide:
      
      * compilation fixes if CONFIG_NF_CONNTRACK is disabled: I moved all the
        conntrack code from nfnetlink_queue.c to nfnetlink_queue_ct.c to avoid
        peppering the entire code with lots of ifdefs. I needed to rename
        nfnetlink_queue.c to nfnetlink_queue_core.c to get it working with the
        Makefile tweaks I've added.
      
      * fix NULL pointer dereference via ctnetlink while trying to change the helper
        for an existing conntrack entry. I don't find any reasonable use case for
        changing the helper from one to another in run-time. Thus, now ctnetlink
        returns -EOPNOTSUPP for this operation.
      
      * fix possible out-of-bound zeroing of the conntrack extension area due to
        the helper automatic assignation routine.
      ====================
      Signed-off-by: NDavid S. Miller <davem@davemloft.net>
      6bdc5f49
    • D
      Merge tag 'batman-adv-for-davem' of git://git.open-mesh.org/linux-merge · f032537f
      David S. Miller 提交于
      Included changes:
      
      * major skb->data pointer usage fix
      * interval version update
      * added get_ethtool_stats() support
      * endianess clean up
      * routing protocol API improvement wrt TT commit code
      * fix locking in hash table code
      * minor cleanups and fixes
      f032537f
    • P
      netfilter: nfnetlink_queue: fix compilation with NF_CONNTRACK disabled · 7c622345
      Pablo Neira Ayuso 提交于
      In "9cb01766 netfilter: add glue code to integrate nfnetlink_queue and ctnetlink"
      the compilation with NF_CONNTRACK disabled is broken. This patch fixes this
      issue.
      
      I have moved the conntrack part into nfnetlink_queue_ct.c to avoid
      peppering the entire nfnetlink_queue.c code with ifdefs.
      
      I also needed to rename nfnetlink_queue.c to nfnetlink_queue_pkt.c
      to update the net/netfilter/Makefile to support conditional compilation
      of the conntrack integration.
      
      This patch also adds CONFIG_NETFILTER_QUEUE_CT in case you want to explicitly
      disable the integration between nf_conntrack and nfnetlink_queue.
      Reported-by: NAndrew Morton <akpm@linux-foundation.org>
      Signed-off-by: NPablo Neira Ayuso <pablo@netfilter.org>
      7c622345