From: David S. Miller <davem@davemloft.net>
Date: Mon, 9 Nov 2009 07:00:54 +0000 (-0800)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4;p=mv-sheeva.git

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/can/usb/ems_usb.c
---

d0e1e88d6e7dbd8e1661cb6a058ca30f54ee39e4
diff --cc drivers/net/benet/be_main.c
index 43180dc210a,876b357101f..c0bd20356ea
--- a/drivers/net/benet/be_main.c
+++ b/drivers/net/benet/be_main.c
@@@ -1608,14 -1608,23 +1608,24 @@@ static int be_open(struct net_device *n
  	/* Rx compl queue may be in unarmed state; rearm it */
  	be_cq_notify(adapter, adapter->rx_obj.cq.id, true, 0);
  
 -	status = be_cmd_link_status_query(adapter, &link_up);
 +	status = be_cmd_link_status_query(adapter, &link_up, &mac_speed,
 +			&link_speed);
  	if (status)
- 		return status;
+ 		goto ret_sts;
  	be_link_status_update(adapter, link_up);
  
+ 	status = be_vid_config(adapter);
+ 	if (status)
+ 		goto ret_sts;
+ 
+ 	status = be_cmd_set_flow_control(adapter,
+ 					adapter->tx_fc, adapter->rx_fc);
+ 	if (status)
+ 		goto ret_sts;
+ 
  	schedule_delayed_work(&adapter->work, msecs_to_jiffies(100));
- 	return 0;
+ ret_sts:
+ 	return status;
  }
  
  static int be_setup(struct be_adapter *adapter)
diff --cc drivers/net/can/usb/ems_usb.c
index 3685f3e42d1,abdbd9c2b78..3e4419054c8
--- a/drivers/net/can/usb/ems_usb.c
+++ b/drivers/net/can/usb/ems_usb.c
@@@ -315,7 -315,11 +315,7 @@@ static void ems_usb_rx_can_msg(struct e
  	if (skb == NULL)
  		return;
  
- 	cf->can_id = msg->msg.can_msg.id;
 -	skb->protocol = htons(ETH_P_CAN);
 -
 -	cf = (struct can_frame *)skb_put(skb, sizeof(struct can_frame));
 -
+ 	cf->can_id = le32_to_cpu(msg->msg.can_msg.id);
  	cf->can_dlc = min_t(u8, msg->msg.can_msg.length, 8);
  
  	if (msg->type == CPC_MSG_TYPE_EXT_CAN_FRAME