From: David S. Miller <davem@davemloft.net>
Date: Mon, 11 Jan 2010 06:55:03 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=d4a66e752d0b19934dd208884f8605fe385aaaa9;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/benet/be_cmds.h
	include/linux/sysctl.h
---

d4a66e752d0b19934dd208884f8605fe385aaaa9
diff --cc drivers/net/benet/be_cmds.h
index 6eed512bb6d4,c002b8391b4d..cb3188f8708d
--- a/drivers/net/benet/be_cmds.h
+++ b/drivers/net/benet/be_cmds.h
@@@ -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);
++
diff --cc drivers/scsi/cxgb3i/cxgb3i_offload.c
index 26ffdcd5a437,7449d465bc17..2a3cf823d68d
--- a/drivers/scsi/cxgb3i/cxgb3i_offload.c
+++ b/drivers/scsi/cxgb3i/cxgb3i_offload.c
@@@ -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
diff --cc include/linux/sysctl.h
index 24ff7e3a0d59,bd27fbc9db62..9f236cdcf3fe
--- a/include/linux/sysctl.h
+++ b/include/linux/sysctl.h
@@@ -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
  };