Changeset 18783

Timestamp:

03/19/12 23:52:30 (14 months ago)

Author:

BrainSlayer

Message:

fix powerpc compile

Location:

src/linux/universal/linux-3.3

Files:

• arch/powerpc/platforms/85xx/rb1000.c (modified) (1 diff)
• arch/powerpc/sysdev/rb_aux.c (modified) (1 diff)
• drivers/net/ethernet/atheros/atl1c/atl1c/atl1c.h (modified) (1 diff)
• drivers/net/ethernet/atheros/atl1c/atl1c/atl1c_ethtool.c (modified) (1 diff)
• drivers/net/ethernet/atheros/atl1c/atl1c/atl1c_main.c (modified) (6 diffs)
• lib/pci_iomap.c (modified) (2 diffs)

src/linux/universal/linux-3.3/arch/powerpc/platforms/85xx/rb1000.c

@@ -133 +133 @@
 
         mpic = mpic_alloc(np, r.start,
-                          MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
+                          MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
                           1, 0, " OpenPIC ");
         

src/linux/universal/linux-3.3/arch/powerpc/sysdev/rb_aux.c

@@ -194 +194 @@
 
         mpic = mpic_alloc(np, r.start, 
-                          MPIC_PRIMARY | MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
+                          MPIC_WANTS_RESET | MPIC_BIG_ENDIAN,
                           4, 0, " OpenPIC ");
         for (i = 0; i < 80; i += 4) {

src/linux/universal/linux-3.3/drivers/net/ethernet/atheros/atl1c/atl1c/atl1c.h

@@ -76 +76 @@
 #define MAX_JUMBO_FRAME_SIZE    (9*1024)
 #define MAX_TX_OFFLOAD_THRESH   (9*1024)
+#define MAX_TSO_FRAME_SIZE      (7*1024)
 
 #define AT_MAX_RECEIVE_QUEUE    4

src/linux/universal/linux-3.3/drivers/net/ethernet/atheros/atl1c/atl1c/atl1c_ethtool.c

@@ -236 +236 @@
         .get_eeprom_len         = atl1c_get_eeprom_len,
         .get_eeprom             = atl1c_get_eeprom,
-        .get_tx_csum            = atl1c_get_tx_csum,
-        .get_sg                 = ethtool_op_get_sg,
-        .set_sg                 = ethtool_op_set_sg,
 };
 

src/linux/universal/linux-3.3/drivers/net/ethernet/atheros/atl1c/atl1c/atl1c_main.c

@@ -395 +395 @@
 }
 
-static void atl1c_vlan_rx_register(struct net_device *netdev,
-                                   struct vlan_group *grp)
+static void __atl1c_vlan_mode(netdev_features_t features, u32 *mac_ctrl_data)
+{
+        if (features & NETIF_F_HW_VLAN_RX) {
+                /* enable VLAN tag insert/strip */
+                *mac_ctrl_data |= MAC_CTRL_RMV_VLAN;
+        } else {
+                /* disable VLAN tag insert/strip */
+                *mac_ctrl_data &= ~MAC_CTRL_RMV_VLAN;
+        }
+}
+
+static void atl1c_vlan_mode(struct net_device *netdev,
+        netdev_features_t features)
 {
         struct atl1c_adapter *adapter = netdev_priv(netdev);
@@ -403 +414 @@
 
         if (netif_msg_pktdata(adapter))
-                dev_dbg(&pdev->dev, "atl1c_vlan_rx_register\n");
+                dev_dbg(&pdev->dev, "atl1c_vlan_mode\n");
 
         atl1c_irq_disable(adapter);
-
-        adapter->vlgrp = grp;
         AT_READ_REG(&adapter->hw, REG_MAC_CTRL, &mac_ctrl_data);
-
-        if (grp) {
-                /* enable VLAN tag insert/strip */
-                mac_ctrl_data |= MAC_CTRL_RMV_VLAN;
-        } else {
-                /* disable VLAN tag insert/strip */
-                mac_ctrl_data &= ~MAC_CTRL_RMV_VLAN;
-        }
-
+        __atl1c_vlan_mode(features, &mac_ctrl_data);
         AT_WRITE_REG(&adapter->hw, REG_MAC_CTRL, mac_ctrl_data);
         atl1c_irq_enable(adapter);
@@ -427 +428 @@
 
         if (netif_msg_pktdata(adapter))
-                dev_dbg(&pdev->dev, "atl1c_restore_vlan !");
-        atl1c_vlan_rx_register(adapter->netdev, adapter->vlgrp);
+                dev_dbg(&pdev->dev, "atl1c_restore_vlan\n");
+        atl1c_vlan_mode(adapter->netdev, adapter->netdev->features);
 }
 /*
@@ -464 +465 @@
                 roundup(mtu + ETH_HLEN + ETH_FCS_LEN + VLAN_HLEN, 8) : AT_RX_BUF_SIZE;
 }
+
+
+static netdev_features_t atl1c_fix_features(struct net_device *netdev,
+        netdev_features_t features)
+{
+        /*
+         * Since there is no support for separate rx/tx vlan accel
+         * enable/disable make sure tx flag is always in same state as rx.
+         */
+        if (features & NETIF_F_HW_VLAN_RX)
+                features |= NETIF_F_HW_VLAN_TX;
+        else
+                features &= ~NETIF_F_HW_VLAN_TX;
+
+        if (netdev->mtu > MAX_TSO_FRAME_SIZE)
+                features &= ~(NETIF_F_TSO | NETIF_F_TSO6);
+
+        return features;
+}
+
+static int atl1c_set_features(struct net_device *netdev,
+        netdev_features_t features)
+{
+        netdev_features_t changed = netdev->features ^ features;
+
+        if (changed & NETIF_F_HW_VLAN_RX)
+                atl1c_vlan_mode(netdev, features);
+
+        return 0;
+}
+
 /*
  * atl1c_change_mtu - Change the Maximum Transfer Unit
@@ -1673 +1705 @@
                 skb->dev = netdev;
                 atl1c_rx_checksum(adapter, skb, rrs);
-                if (unlikely(adapter->vlgrp) &&
-                    le32_to_cpu(rrs->word3) & RRS_VLAN_INS) {
+
+                if (le32_to_cpu(rrs->word3) & RRS_VLAN_INS) {
                         u16 vlan;
 
                         AT_TAG_TO_VLAN(rrs->vlan_tag, vlan);
                         vlan = le16_to_cpu(vlan);
-                        vlan_hwaccel_receive_skb(skb, adapter->vlgrp, vlan);
-                } else
-                        netif_receive_skb(skb);
+                        __vlan_hwaccel_put_tag(skb, vlan);
+                }
+                netif_receive_skb(skb);
 
                 netdev->last_rx = jiffies;
@@ -2421 +2453 @@
         .ndo_set_rx_mode        = atl1c_set_multi,
         .ndo_change_mtu         = atl1c_change_mtu,
+        .ndo_fix_features       = atl1c_fix_features,
+        .ndo_set_features       = atl1c_set_features,
         .ndo_do_ioctl           = atl1c_ioctl,
         .ndo_tx_timeout         = atl1c_tx_timeout,
         .ndo_get_stats          = atl1c_get_stats,
-        .ndo_vlan_rx_register   = atl1c_vlan_rx_register,
+//      .ndo_vlan_rx_register   = atl1c_vlan_rx_register,
 #ifdef CONFIG_NET_POLL_CONTROLLER
         .ndo_poll_controller    = atl1c_netpoll,

src/linux/universal/linux-3.3/lib/pci_iomap.c

@@ -10 +10 @@
 
 #ifdef CONFIG_PCI
+#ifndef CONFIG_RB_IOMAP
 /**
  * pci_iomap - create a virtual mapping cookie for a PCI BAR
@@ -46 +47 @@
 
 EXPORT_SYMBOL(pci_iomap);
+#endif
 #endif /* CONFIG_PCI */