Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Mon, 11 Jan 2010 06:55:03 +0000 (22:55 -0800)]
Conflicts:
drivers/net/benet/be_cmds.h
include/linux/sysctl.h

29 files changed:
1  2 
drivers/net/atlx/atl2.c
drivers/net/benet/be_cmds.c
drivers/net/benet/be_cmds.h
drivers/net/benet/be_ethtool.c
drivers/net/bnx2x_main.c
drivers/net/e1000e/netdev.c
drivers/net/igb/igb_main.c
drivers/net/igbvf/netdev.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/netxen/netxen_nic.h
drivers/net/netxen/netxen_nic_init.c
drivers/net/netxen/netxen_nic_main.c
drivers/net/niu.c
drivers/net/pcmcia/pcnet_cs.c
drivers/net/pcnet32.c
drivers/net/rrunner.c
drivers/net/sfc/efx.c
drivers/net/sh_eth.c
drivers/net/tulip/dmfe.c
drivers/net/tulip/tulip_core.c
drivers/net/usb/rtl8150.c
drivers/net/via-rhine.c
drivers/net/via-velocity.c
drivers/net/vxge/vxge-main.c
drivers/net/wireless/libertas/mesh.c
drivers/scsi/cxgb3i/cxgb3i_offload.c
include/linux/inetdevice.h
include/linux/sysctl.h
net/ipv4/devinet.c

Simple merge
Simple merge
@@@ -926,5 -926,5 +940,8 @@@ extern int be_cmd_loopback_test(struct 
                                u32 num_pkts, u64 pattern);
  extern int be_cmd_ddr_dma_test(struct be_adapter *adapter, u64 pattern,
                        u32 byte_cnt, struct be_dma_mem *cmd);
 +extern int be_cmd_get_seeprom_data(struct be_adapter *adapter,
 +                              struct be_dma_mem *nonemb_cmd);
+ extern int be_cmd_set_loopback(struct be_adapter *adapter, u8 port_num,
+                               u8 loopback_type, u8 enable);
++
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -1563,9 -1567,29 +1567,29 @@@ free_tid
        s3_free_atid(cdev, c3cn->tid);
        c3cn->tid = 0;
  out_err:
 -      return -1;
 +      return -EINVAL;
  }
  
+ /* *
+  * cxgb3i_find_dev - find the interface associated with the given address
+  * @ipaddr: ip address
+  */
+ static struct net_device *
+ cxgb3i_find_dev(struct net_device *dev, __be32 ipaddr)
+ {
+       struct flowi fl;
+       int err;
+       struct rtable *rt;
+       memset(&fl, 0, sizeof(fl));
+       fl.nl_u.ip4_u.daddr = ipaddr;
+       err = ip_route_output_key(dev ? dev_net(dev) : &init_net, &rt, &fl);
+       if (!err)
+               return (&rt->u.dst)->dev;
+       return NULL;
+ }
  
  /**
   * cxgb3i_c3cn_connect - initiates an iscsi tcp connection to a given address
Simple merge
@@@ -482,7 -482,7 +482,8 @@@ enu
        NET_IPV4_CONF_ARP_ACCEPT=21,
        NET_IPV4_CONF_ARP_NOTIFY=22,
        NET_IPV4_CONF_ACCEPT_LOCAL=23,
-       NET_IPV4_CONF_PROXY_ARP_PVLAN=24,
+       NET_IPV4_CONF_SRC_VMARK=24,
++      NET_IPV4_CONF_PROXY_ARP_PVLAN=25,
        __NET_IPV4_CONF_MAX
  };
  
Simple merge