* [PATCH 1/1] r8169: Removed unused macros from r8169.c
[not found] <r8169-Removed-unused-macros-from-r8169.c>
@ 2012-08-10 14:33 ` Dayanidhi Sreenivasan
2012-11-11 16:48 ` Dayanidhi Sreenivasan
1 sibling, 0 replies; 4+ messages in thread
From: Dayanidhi Sreenivasan @ 2012-08-10 14:33 UTC (permalink / raw)
To: romieu, nic_swsd; +Cc: netdev, linux-kernel, Dayanidhi Sreenivasan
Signed-off-by: Dayanidhi Sreenivasan <dayanidhi.sreenivasan@gmail.com>
---
drivers/net/ethernet/realtek/r8169.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index b47d5b3..60b45ca 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -78,23 +78,18 @@ static const int multicast_filter_limit = 32;
#define MAX_READ_REQUEST_SHIFT 12
#define TX_DMA_BURST 6 /* Maximum PCI burst, '6' is 1024 */
-#define SafeMtu 0x1c20 /* ... actually life sucks beyond ~7k */
#define InterFrameGap 0x03 /* 3 means InterFrameGap = the shortest one */
#define R8169_REGS_SIZE 256
#define R8169_NAPI_WEIGHT 64
#define NUM_TX_DESC 64 /* Number of Tx descriptor registers */
#define NUM_RX_DESC 256 /* Number of Rx descriptor registers */
-#define RX_BUF_SIZE 1536 /* Rx Buffer size */
#define R8169_TX_RING_BYTES (NUM_TX_DESC * sizeof(struct TxDesc))
#define R8169_RX_RING_BYTES (NUM_RX_DESC * sizeof(struct RxDesc))
#define RTL8169_TX_TIMEOUT (6*HZ)
#define RTL8169_PHY_TIMEOUT (10*HZ)
-#define RTL_EEPROM_SIG cpu_to_le32(0x8129)
-#define RTL_EEPROM_SIG_MASK cpu_to_le32(0xffff)
-#define RTL_EEPROM_SIG_ADDR 0x0000
/* write/read MMIO register */
#define RTL_W8(reg, val8) writeb ((val8), ioaddr + (reg))
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH 1/1] r8169: Removed unused macros from r8169.c
[not found] <r8169-Removed-unused-macros-from-r8169.c>
2012-08-10 14:33 ` [PATCH 1/1] r8169: Removed unused macros from r8169.c Dayanidhi Sreenivasan
@ 2012-11-11 16:48 ` Dayanidhi Sreenivasan
2012-11-11 22:07 ` Francois Romieu
1 sibling, 1 reply; 4+ messages in thread
From: Dayanidhi Sreenivasan @ 2012-11-11 16:48 UTC (permalink / raw)
To: romieu, nic_swsd; +Cc: netdev, linux-kernel, Dayanidhi Sreenivasan
Signed-off-by: Dayanidhi Sreenivasan <dayanidhi.sreenivasan@gmail.com>
---
drivers/net/ethernet/realtek/r8169.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index b47d5b3..60b45ca 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -78,23 +78,18 @@ static const int multicast_filter_limit = 32;
#define MAX_READ_REQUEST_SHIFT 12
#define TX_DMA_BURST 6 /* Maximum PCI burst, '6' is 1024 */
-#define SafeMtu 0x1c20 /* ... actually life sucks beyond ~7k */
#define InterFrameGap 0x03 /* 3 means InterFrameGap = the shortest one */
#define R8169_REGS_SIZE 256
#define R8169_NAPI_WEIGHT 64
#define NUM_TX_DESC 64 /* Number of Tx descriptor registers */
#define NUM_RX_DESC 256 /* Number of Rx descriptor registers */
-#define RX_BUF_SIZE 1536 /* Rx Buffer size */
#define R8169_TX_RING_BYTES (NUM_TX_DESC * sizeof(struct TxDesc))
#define R8169_RX_RING_BYTES (NUM_RX_DESC * sizeof(struct RxDesc))
#define RTL8169_TX_TIMEOUT (6*HZ)
#define RTL8169_PHY_TIMEOUT (10*HZ)
-#define RTL_EEPROM_SIG cpu_to_le32(0x8129)
-#define RTL_EEPROM_SIG_MASK cpu_to_le32(0xffff)
-#define RTL_EEPROM_SIG_ADDR 0x0000
/* write/read MMIO register */
#define RTL_W8(reg, val8) writeb ((val8), ioaddr + (reg))
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH 1/1] r8169: Removed unused macros from r8169.c
2012-11-11 16:48 ` Dayanidhi Sreenivasan
@ 2012-11-11 22:07 ` Francois Romieu
0 siblings, 0 replies; 4+ messages in thread
From: Francois Romieu @ 2012-11-11 22:07 UTC (permalink / raw)
To: Dayanidhi Sreenivasan; +Cc: nic_swsd, netdev, linux-kernel, Hayes Wang
Dayanidhi Sreenivasan <dayanidhi.sreenivasan@gmail.com> :
[...]
I have fixed the conflict with the driver in net-next due to removal of
the SafeMtu #define and pushed the result in branch davem-next.r8169 at
git://violet.fr.zoreil.com/romieu/linux
Next time you send a patch, please specify the branch it should apply
to and check it does not conflict.
Thanks.
--
Ueimor
^ permalink raw reply [flat|nested] 4+ messages in thread
[parent not found: <[PATCH 1/1] r8169: Removed unused macros from r8169.c>]
* [PATCH 1/1] r8169: Removed unused macros from r8169.c
[not found] <[PATCH 1/1] r8169: Removed unused macros from r8169.c>
@ 2012-11-11 6:37 ` Dayanidhi Sreenivasan
0 siblings, 0 replies; 4+ messages in thread
From: Dayanidhi Sreenivasan @ 2012-11-11 6:37 UTC (permalink / raw)
To: romieu, nic_swsd; +Cc: netdev, linux-kernel, Dayanidhi Sreenivasan
Signed-off-by: Dayanidhi Sreenivasan <dayanidhi.sreenivasan@gmail.com>
---
drivers/net/ethernet/realtek/r8169.c | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index b47d5b3..60b45ca 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -78,23 +78,18 @@ static const int multicast_filter_limit = 32;
#define MAX_READ_REQUEST_SHIFT 12
#define TX_DMA_BURST 6 /* Maximum PCI burst, '6' is 1024 */
-#define SafeMtu 0x1c20 /* ... actually life sucks beyond ~7k */
#define InterFrameGap 0x03 /* 3 means InterFrameGap = the shortest one */
#define R8169_REGS_SIZE 256
#define R8169_NAPI_WEIGHT 64
#define NUM_TX_DESC 64 /* Number of Tx descriptor registers */
#define NUM_RX_DESC 256 /* Number of Rx descriptor registers */
-#define RX_BUF_SIZE 1536 /* Rx Buffer size */
#define R8169_TX_RING_BYTES (NUM_TX_DESC * sizeof(struct TxDesc))
#define R8169_RX_RING_BYTES (NUM_RX_DESC * sizeof(struct RxDesc))
#define RTL8169_TX_TIMEOUT (6*HZ)
#define RTL8169_PHY_TIMEOUT (10*HZ)
-#define RTL_EEPROM_SIG cpu_to_le32(0x8129)
-#define RTL_EEPROM_SIG_MASK cpu_to_le32(0xffff)
-#define RTL_EEPROM_SIG_ADDR 0x0000
/* write/read MMIO register */
#define RTL_W8(reg, val8) writeb ((val8), ioaddr + (reg))
--
1.7.5.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2012-11-11 22:07 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <r8169-Removed-unused-macros-from-r8169.c>
2012-08-10 14:33 ` [PATCH 1/1] r8169: Removed unused macros from r8169.c Dayanidhi Sreenivasan
2012-11-11 16:48 ` Dayanidhi Sreenivasan
2012-11-11 22:07 ` Francois Romieu
[not found] <[PATCH 1/1] r8169: Removed unused macros from r8169.c>
2012-11-11 6:37 ` Dayanidhi Sreenivasan
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).