Commit 7f2bf948 authored by Alan Cox's avatar Alan Cox Committed by Greg Kroah-Hartman

Staging: et131x: Kill the NoPhyAccess variable

Another write once "variable"
Signed-off-by: default avatarAlan Cox <alan@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 4e02b4b5
...@@ -368,8 +368,7 @@ int et131x_send_packets(struct sk_buff *skb, struct net_device *netdev) ...@@ -368,8 +368,7 @@ int et131x_send_packets(struct sk_buff *skb, struct net_device *netdev)
* if( MP_SHOULD_FAIL_SEND( etdev ) || * if( MP_SHOULD_FAIL_SEND( etdev ) ||
* etdev->DriverNoPhyAccess ) * etdev->DriverNoPhyAccess )
*/ */
if (MP_SHOULD_FAIL_SEND(etdev) || etdev->DriverNoPhyAccess if (MP_SHOULD_FAIL_SEND(etdev) || !netif_carrier_ok(netdev)) {
|| !netif_carrier_ok(netdev)) {
dev_kfree_skb_any(skb); dev_kfree_skb_any(skb);
skb = NULL; skb = NULL;
......
...@@ -248,7 +248,6 @@ struct et131x_adapter { ...@@ -248,7 +248,6 @@ struct et131x_adapter {
NETIF_STATUS_MEDIA_DISCONNECT, NETIF_STATUS_MEDIA_DISCONNECT,
NETIF_STATUS_MAX NETIF_STATUS_MAX
} MediaState; } MediaState;
u8 DriverNoPhyAccess;
/* Minimize init-time */ /* Minimize init-time */
struct timer_list ErrorTimer; struct timer_list ErrorTimer;
......
...@@ -109,9 +109,6 @@ void et131x_enable_interrupts(struct et131x_adapter *adapter) ...@@ -109,9 +109,6 @@ void et131x_enable_interrupts(struct et131x_adapter *adapter)
else else
mask = INT_MASK_ENABLE_NO_FLOW; mask = INT_MASK_ENABLE_NO_FLOW;
if (adapter->DriverNoPhyAccess)
mask |= ET_INTR_PHY;
adapter->CachedMaskValue = mask; adapter->CachedMaskValue = mask;
writel(mask, &adapter->regs->global.int_mask); writel(mask, &adapter->regs->global.int_mask);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment