From 39d3cca9e4c27502aa01f3989ceac8ad8f3990a1 Mon Sep 17 00:00:00 2001 From: Alexander Duyck Date: Wed, 8 Aug 2012 05:18:04 +0000 Subject: [PATCH] --- yaml --- r: 321583 b: refs/heads/master c: a2d6a1d5a435b051d3660961d5dee5b33b15f754 h: refs/heads/master i: 321581: 4919f96ba49c06e9076b61af10fcb54bb99d1a4f 321579: 1ff2727b0eaab9b131029e4fb4cf9cd3094daecd 321575: 4604d5815434a64bd18615d02cc8819fbbb7920b 321567: cdbc1ad42f4b7c266b9c99e704cc9b7e9a4d3816 v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/intel/igb/e1000_regs.h | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a3f12a083cf6..4d34e0ecf598 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f0c5dadff3fbda77a65b8577fee437c3d771233d +refs/heads/master: a2d6a1d5a435b051d3660961d5dee5b33b15f754 diff --git a/trunk/drivers/net/ethernet/intel/igb/e1000_regs.h b/trunk/drivers/net/ethernet/intel/igb/e1000_regs.h index 10efcd88dca0..28394bea5253 100644 --- a/trunk/drivers/net/ethernet/intel/igb/e1000_regs.h +++ b/trunk/drivers/net/ethernet/intel/igb/e1000_regs.h @@ -156,8 +156,12 @@ : (0x0E018 + ((_n) * 0x40))) #define E1000_TXDCTL(_n) ((_n) < 4 ? (0x03828 + ((_n) * 0x100)) \ : (0x0E028 + ((_n) * 0x40))) -#define E1000_DCA_TXCTRL(_n) (0x03814 + (_n << 8)) -#define E1000_DCA_RXCTRL(_n) (0x02814 + (_n << 8)) +#define E1000_RXCTL(_n) ((_n) < 4 ? (0x02814 + ((_n) * 0x100)) : \ + (0x0C014 + ((_n) * 0x40))) +#define E1000_DCA_RXCTRL(_n) E1000_RXCTL(_n) +#define E1000_TXCTL(_n) ((_n) < 4 ? (0x03814 + ((_n) * 0x100)) : \ + (0x0E014 + ((_n) * 0x40))) +#define E1000_DCA_TXCTRL(_n) E1000_TXCTL(_n) #define E1000_TDWBAL(_n) ((_n) < 4 ? (0x03838 + ((_n) * 0x100)) \ : (0x0E038 + ((_n) * 0x40))) #define E1000_TDWBAH(_n) ((_n) < 4 ? (0x0383C + ((_n) * 0x100)) \