aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/sungem.h
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/sungem.h')
-rw-r--r--drivers/net/sungem.h12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/sungem.h b/drivers/net/sungem.h
index 89847215d006..a70067c85cc9 100644
--- a/drivers/net/sungem.h
+++ b/drivers/net/sungem.h
@@ -813,7 +813,7 @@
813/* MII BCM5400 AUXSTATUS register */ 813/* MII BCM5400 AUXSTATUS register */
814#define MII_BCM5400_AUXSTATUS 0x19 814#define MII_BCM5400_AUXSTATUS 0x19
815#define MII_BCM5400_AUXSTATUS_LINKMODE_MASK 0x0700 815#define MII_BCM5400_AUXSTATUS_LINKMODE_MASK 0x0700
816#define MII_BCM5400_AUXSTATUS_LINKMODE_SHIFT 8 816#define MII_BCM5400_AUXSTATUS_LINKMODE_SHIFT 8
817 817
818/* When it can, GEM internally caches 4 aligned TX descriptors 818/* When it can, GEM internally caches 4 aligned TX descriptors
819 * at a time, so that it can use full cacheline DMA reads. 819 * at a time, so that it can use full cacheline DMA reads.
@@ -984,10 +984,10 @@ struct gem {
984 unsigned int asleep_wol : 1; /* was asleep with WOL enabled */ 984 unsigned int asleep_wol : 1; /* was asleep with WOL enabled */
985 unsigned int opened : 1; /* driver opened, protected by pm_mutex */ 985 unsigned int opened : 1; /* driver opened, protected by pm_mutex */
986 unsigned int running : 1; /* chip running, protected by lock */ 986 unsigned int running : 1; /* chip running, protected by lock */
987 987
988 /* cell enable count, protected by lock */ 988 /* cell enable count, protected by lock */
989 int cell_enabled; 989 int cell_enabled;
990 990
991 struct mutex pm_mutex; 991 struct mutex pm_mutex;
992 992
993 u32 msg_enable; 993 u32 msg_enable;
@@ -1017,7 +1017,7 @@ struct gem {
1017 enum gem_phy_type phy_type; 1017 enum gem_phy_type phy_type;
1018 struct mii_phy phy_mii; 1018 struct mii_phy phy_mii;
1019 int mii_phy_addr; 1019 int mii_phy_addr;
1020 1020
1021 struct gem_init_block *init_block; 1021 struct gem_init_block *init_block;
1022 struct sk_buff *rx_skbs[RX_RING_SIZE]; 1022 struct sk_buff *rx_skbs[RX_RING_SIZE];
1023 struct sk_buff *tx_skbs[TX_RING_SIZE]; 1023 struct sk_buff *tx_skbs[TX_RING_SIZE];
@@ -1032,7 +1032,7 @@ struct gem {
1032 1032
1033#define found_mii_phy(gp) ((gp->phy_type == phy_mii_mdio0 || gp->phy_type == phy_mii_mdio1) \ 1033#define found_mii_phy(gp) ((gp->phy_type == phy_mii_mdio0 || gp->phy_type == phy_mii_mdio1) \
1034 && gp->phy_mii.def && gp->phy_mii.def->ops) 1034 && gp->phy_mii.def && gp->phy_mii.def->ops)
1035 1035
1036#define ALIGNED_RX_SKB_ADDR(addr) \ 1036#define ALIGNED_RX_SKB_ADDR(addr) \
1037 ((((unsigned long)(addr) + (64UL - 1UL)) & ~(64UL - 1UL)) - (unsigned long)(addr)) 1037 ((((unsigned long)(addr) + (64UL - 1UL)) & ~(64UL - 1UL)) - (unsigned long)(addr))
1038static __inline__ struct sk_buff *gem_alloc_skb(int size, 1038static __inline__ struct sk_buff *gem_alloc_skb(int size,