Skip to content
Extraits de code Groupes Projets
Valider 90b65b8a rédigé par eddietwo's avatar eddietwo
Parcourir les fichiers

calculate a correct count of the receive buffers to be refilled (11/7/03 patch from Kevin Lahey)

parent 4fee2e8f
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -150,6 +150,8 @@ struct e1000_desc_ring { ...@@ -150,6 +150,8 @@ struct e1000_desc_ring {
#define E1000_DESC_UNUSED(R) \ #define E1000_DESC_UNUSED(R) \
((((R)->next_to_clean + (R)->count) - ((R)->next_to_use + 1)) % ((R)->count)) ((((R)->next_to_clean + (R)->count) - ((R)->next_to_use + 1)) % ((R)->count))
#define E1000_RX_DESC_UNUSED(R) \
((((R)->next_to_clean + (R)->count) - ((R)->next_to_use)) % ((R)->count))
#define E1000_GET_DESC(R, i, type) (&(((struct type *)((R).desc))[i])) #define E1000_GET_DESC(R, i, type) (&(((struct type *)((R).desc))[i]))
#define E1000_RX_DESC(R, i) E1000_GET_DESC(R, i, e1000_rx_desc) #define E1000_RX_DESC(R, i) E1000_GET_DESC(R, i, e1000_rx_desc)
......
...@@ -2678,7 +2678,7 @@ e1000_rx_refill(struct net_device *dev, struct sk_buff **skbs) ...@@ -2678,7 +2678,7 @@ e1000_rx_refill(struct net_device *dev, struct sk_buff **skbs)
struct sk_buff *skb_list; struct sk_buff *skb_list;
if(skbs == 0) if(skbs == 0)
return E1000_DESC_UNUSED(&adapter->rx_ring); return E1000_RX_DESC_UNUSED(&adapter->rx_ring);
i = adapter->rx_ring.next_to_use; i = adapter->rx_ring.next_to_use;
skb_list = *skbs; skb_list = *skbs;
...@@ -2727,7 +2727,7 @@ e1000_rx_refill(struct net_device *dev, struct sk_buff **skbs) ...@@ -2727,7 +2727,7 @@ e1000_rx_refill(struct net_device *dev, struct sk_buff **skbs)
e1000_watchdog_1(adapter); e1000_watchdog_1(adapter);
} }
return E1000_DESC_UNUSED(&adapter->rx_ring); return E1000_RX_DESC_UNUSED(&adapter->rx_ring);
} }
static int static int
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter