From 4790aae240b47c8ef8eac8b476426a060b8f4097 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 16 Mar 2008 22:43:06 +0000 Subject: [PATCH] --- yaml --- r: 87815 b: refs/heads/master c: 7deb07b1befc9f09dbdaed66c9613a3d08f1c061 h: refs/heads/master i: 87813: a5a905cd52069f4183300762456c10841a8dbac6 87811: faee1089c04844376773d2cfd09f85eba3dc3ae5 87807: 35307a3dbd22aa815cc9d3cbcb21da4ccccee7fe v: v3 --- [refs] | 2 +- trunk/drivers/net/igb/igb_main.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 333ce789d6e1..8284c1059914 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2cfb8b71ccb3ebca76cff48241527eba39226883 +refs/heads/master: 7deb07b1befc9f09dbdaed66c9613a3d08f1c061 diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c index 928ce8287e69..9f3168d6e239 100644 --- a/trunk/drivers/net/igb/igb_main.c +++ b/trunk/drivers/net/igb/igb_main.c @@ -3452,8 +3452,8 @@ static bool igb_clean_rx_irq_adv(struct igb_adapter *adapter, * that case, it fills the header buffer and spills the rest * into the page. */ - hlen = le16_to_cpu((rx_desc->wb.lower.lo_dword.hdr_info & - E1000_RXDADV_HDRBUFLEN_MASK) >> E1000_RXDADV_HDRBUFLEN_SHIFT); + hlen = (le16_to_cpu(rx_desc->wb.lower.lo_dword.hdr_info) & + E1000_RXDADV_HDRBUFLEN_MASK) >> E1000_RXDADV_HDRBUFLEN_SHIFT; if (hlen > adapter->rx_ps_hdr_size) hlen = adapter->rx_ps_hdr_size;