Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 14 insertions, 7 deletions

diff --git a/drivers/net/ps3_gelic_net.h b/drivers/net/ps3_gelic_net.h
index 8b413868bbe2..32521ae5e824 100644
--- a/drivers/net/ps3_gelic_net.h
+++ b/drivers/net/ps3_gelic_net.h
@@ -186,7 +186,7 @@ enum gelic_lv1_net_control_code {
         GELIC_LV1_GET_CHANNEL           = 6,
         GELIC_LV1_POST_WLAN_CMD         = 9,
         GELIC_LV1_GET_WLAN_CMD_RESULT   = 10,
-        GELIC_LV1_GET_WLAN_EVENT        = 11
+        GELIC_LV1_GET_WLAN_EVENT        = 11,
 };
 
 /* for GELIC_LV1_SET_WOL */
@@ -217,24 +217,29 @@ enum gelic_lv1_ether_port_status {
         GELIC_LV1_ETHER_SPEED_10        = 0x0000000000000010L,
         GELIC_LV1_ETHER_SPEED_100       = 0x0000000000000020L,
         GELIC_LV1_ETHER_SPEED_1000      = 0x0000000000000040L,
-        GELIC_LV1_ETHER_SPEED_MASK      = 0x0000000000000070L
+        GELIC_LV1_ETHER_SPEED_MASK      = 0x0000000000000070L,
 };
 
 enum gelic_lv1_vlan_index {
         /* for outgoing packets */
-        GELIC_LV1_VLAN_TX_ETHERNET      = 0x0000000000000002L,
+        GELIC_LV1_VLAN_TX_ETHERNET_0    = 0x0000000000000002L,
         GELIC_LV1_VLAN_TX_WIRELESS      = 0x0000000000000003L,
+
         /* for incoming packets */
-        GELIC_LV1_VLAN_RX_ETHERNET      = 0x0000000000000012L,
-        GELIC_LV1_VLAN_RX_WIRELESS      = 0x0000000000000013L
+        GELIC_LV1_VLAN_RX_ETHERNET_0    = 0x0000000000000012L,
+        GELIC_LV1_VLAN_RX_WIRELESS      = 0x0000000000000013L,
+};
+
+enum gelic_lv1_phy {
+        GELIC_LV1_PHY_ETHERNET_0        = 0x0000000000000002L,
 };
 
 /* size of hardware part of gelic descriptor */
 #define GELIC_DESCR_SIZE        (32)
 
 enum gelic_port_type {
-        GELIC_PORT_ETHERNET = 0,
-        GELIC_PORT_WIRELESS = 1,
+        GELIC_PORT_ETHERNET_0   = 0,
+        GELIC_PORT_WIRELESS     = 1,
         GELIC_PORT_MAX
 };
 
@@ -302,6 +307,8 @@ struct gelic_card {
         atomic_t users;
 
         u64 ether_port_status;
+        int link_mode;
+
         /* original address returned by kzalloc */
         void *unalign;