diff --git a/[refs] b/[refs] index a19cf8943919..562845840482 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d6d9ca0fec6aea0f2e4064474a1c5cdbed873c63 +refs/heads/master: e2df8b7f6665075f7fe93613897117743c7bf0ba diff --git a/trunk/drivers/net/ks8842.c b/trunk/drivers/net/ks8842.c index ee69dea69be8..634dad1c8b48 100644 --- a/trunk/drivers/net/ks8842.c +++ b/trunk/drivers/net/ks8842.c @@ -424,16 +424,14 @@ static int ks8842_tx_frame(struct sk_buff *skb, struct net_device *netdev) static void ks8842_rx_frame(struct net_device *netdev, struct ks8842_adapter *adapter) { - u16 status16; u32 status; int len; if (adapter->conf_flags & KS884X_16BIT) { - status16 = ks8842_read16(adapter, 17, REG_QMU_DATA_LO); - len = (int)ks8842_read16(adapter, 17, REG_QMU_DATA_HI); - len &= 0xffff; + status = ks8842_read16(adapter, 17, REG_QMU_DATA_LO); + len = ks8842_read16(adapter, 17, REG_QMU_DATA_HI); netdev_dbg(netdev, "%s - rx_data: status: %x\n", - __func__, status16); + __func__, status); } else { status = ks8842_read32(adapter, 17, REG_QMU_DATA_LO); len = (status >> 16) & 0x7ff;