Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
David S. Miller [Mon, 9 Nov 2009 07:00:54 +0000 (23:00 -0800)]
Conflicts:
drivers/net/can/usb/ems_usb.c

12 files changed:
1  2 
drivers/net/benet/be.h
drivers/net/benet/be_ethtool.c
drivers/net/benet/be_main.c
drivers/net/can/dev.c
drivers/net/can/usb/ems_usb.c
drivers/net/fsl_pq_mdio.c
drivers/net/ixgbe/ixgbe_main.c
drivers/net/qlge/qlge_main.c
drivers/net/qlge/qlge_mpi.c
drivers/net/wireless/ipw2x00/ipw2200.c
net/can/bcm.c
net/ipv4/ipip.c

Simple merge
Simple merge
@@@ -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)
Simple merge
@@@ -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
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc net/can/bcm.c
Simple merge
diff --cc net/ipv4/ipip.c
Simple merge