* [PATCH net-next v3.16]r9169: Correct Set Vlan tag
@ 2016-03-29 8:33 Corcodel Marian
2016-03-29 13:29 ` Eric Dumazet
2016-03-29 20:59 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Corcodel Marian @ 2016-03-29 8:33 UTC (permalink / raw)
To: netdev; +Cc: Francois Romieu, Corcodel Marian
This patch add set Vlan tag and flush CPlusCmd register because when unset
RxVlan and RxChkSum bit, whithout some explication , unwanted bits
is set, PCIDAC, PCIMulRW and others.Whithout this patch when run
ethtool -d eth0 on "C+ Command" field missing "VLAN de-tagging"
Signed-off-by: Corcodel Marian <asd@marian1000.go.ro>
---
drivers/net/ethernet/realtek/r8169.c | 21 +++------------------
1 file changed, 3 insertions(+), 18 deletions(-)
diff --git a/drivers/net/ethernet/realtek/r8169.c b/drivers/net/ethernet/realtek/r8169.c
index 2594bbb..df7ea28 100644
--- a/drivers/net/ethernet/realtek/r8169.c
+++ b/drivers/net/ethernet/realtek/r8169.c
@@ -752,7 +752,7 @@ struct rtl8169_private {
void *Rx_databuff[NUM_RX_DESC]; /* Rx data buffers */
struct ring_info tx_skb[NUM_TX_DESC]; /* Tx data buffers */
struct timer_list timer;
- u16 cp_cmd;
+ int cp_cmd;
u16 event_slow;
@@ -1797,7 +1797,7 @@ static void __rtl8169_set_features(struct net_device *dev,
netdev_features_t features)
{
struct rtl8169_private *tp = netdev_priv(dev);
- netdev_features_t changed = features ^ dev->features;
+ netdev_features_t changed = features & dev->features;
void __iomem *ioaddr = tp->mmio_addr;
if (!(changed & (NETIF_F_RXALL | NETIF_F_RXCSUM |
@@ -1807,16 +1807,10 @@ static void __rtl8169_set_features(struct net_device *dev,
if (changed & (NETIF_F_RXCSUM | NETIF_F_HW_VLAN_CTAG_RX)) {
if (features & NETIF_F_RXCSUM)
tp->cp_cmd |= RxChkSum;
- else
- tp->cp_cmd &= ~RxChkSum;
if (dev->features & NETIF_F_HW_VLAN_CTAG_RX)
tp->cp_cmd |= RxVlan;
- else
- tp->cp_cmd &= ~RxVlan;
- RTL_W16(CPlusCmd, tp->cp_cmd);
- RTL_R16(CPlusCmd);
}
if (changed & NETIF_F_RXALL) {
int tmp = (RTL_R32(RxConfig) & ~(AcceptErr | AcceptRunt));
@@ -6573,8 +6567,6 @@ static int rtl_open(struct net_device *dev)
rtl8169_init_phy(dev, tp);
- __rtl8169_set_features(dev, dev->features);
-
rtl_pll_power_up(tp);
rtl_hw_start(dev);
@@ -7060,7 +7052,7 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_out_mwi_2;
}
- tp->cp_cmd = RxChkSum;
+ tp->cp_cmd = ~0xffff;
if ((sizeof(dma_addr_t) > 4) &&
!pci_set_dma_mask(pdev, DMA_BIT_MASK(64)) && use_dac) {
@@ -7101,13 +7093,6 @@ rtl_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
pci_set_master(pdev);
- /*
- * Pretend we are using VLANs; This bypasses a nasty bug where
- * Interrupts stop flowing on high load on 8110SCd controllers.
- */
- if (tp->mac_version == RTL_GIGA_MAC_VER_05)
- tp->cp_cmd |= RxVlan;
-
rtl_init_mdio_ops(tp);
rtl_init_pll_power_ops(tp);
rtl_init_jumbo_ops(tp);
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v3.16]r9169: Correct Set Vlan tag
2016-03-29 8:33 [PATCH net-next v3.16]r9169: Correct Set Vlan tag Corcodel Marian
@ 2016-03-29 13:29 ` Eric Dumazet
2016-03-29 20:59 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Eric Dumazet @ 2016-03-29 13:29 UTC (permalink / raw)
To: Corcodel Marian; +Cc: netdev, Francois Romieu
On Tue, 2016-03-29 at 11:33 +0300, Corcodel Marian wrote:
> This patch add set Vlan tag and flush CPlusCmd register because when unset
> RxVlan and RxChkSum bit, whithout some explication , unwanted bits
> is set, PCIDAC, PCIMulRW and others.Whithout this patch when run
> ethtool -d eth0 on "C+ Command" field missing "VLAN de-tagging"
Are you a bot or a human being ?
It really looks like a program was assigned to fool us, sending
random patches targeting r8169 and random linux kernels.
We wont accept patches if they are not targeting current linux kernels.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH net-next v3.16]r9169: Correct Set Vlan tag
2016-03-29 8:33 [PATCH net-next v3.16]r9169: Correct Set Vlan tag Corcodel Marian
2016-03-29 13:29 ` Eric Dumazet
@ 2016-03-29 20:59 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2016-03-29 20:59 UTC (permalink / raw)
To: asd; +Cc: netdev, romieu
From: Corcodel Marian <asd@marian1000.go.ro>
Date: Tue, 29 Mar 2016 11:33:20 +0300
> This patch add set Vlan tag and flush CPlusCmd register because when unset
> RxVlan and RxChkSum bit, whithout some explication , unwanted bits
> is set, PCIDAC, PCIMulRW and others.Whithout this patch when run
> ethtool -d eth0 on "C+ Command" field missing "VLAN de-tagging"
>
> Signed-off-by: Corcodel Marian <asd@marian1000.go.ro>
I am hereby blocking you from making any and all postings to the
mailing lists at vger.kernel.org
There is not negotiating about this, all complaints sent to me will be
ignored. You should have thought about the consequences of your
actions (or lack thereof) over the past several months.
You cannot continually post patches, as you please, and completely
refuse to interact with the developers who review your changes and
give you feedback.
You have not coherently replied to any feedback you have been given.
You have almost always ignored the feedback you were given and
continued to make the same undesirable changes over and over again.
And you refuse to even acknowledge or address the issue of your
interactions with the community in any way whatsoever.
Therefore you are hurting development, and wasting precious developer
resources with your postings.
All of this is unacceptable.
But that all ends right now.
Thank you.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-29 20:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-29 8:33 [PATCH net-next v3.16]r9169: Correct Set Vlan tag Corcodel Marian
2016-03-29 13:29 ` Eric Dumazet
2016-03-29 20:59 ` David Miller
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).