From: Jon Mason <jdmason@us.ibm.com>
To: Francois Romieu <romieu@fr.zoreil.com>
Cc: netdev@oss.sgi.com
Subject: [PATCH 3/3] r8169: clean up
Date: Tue, 2 Nov 2004 12:03:25 -0600 [thread overview]
Message-ID: <200411021203.25100.jdmason@us.ibm.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1849 bytes --]
Removal of some magic numbers, unnecessary double not, and addition of "link
down" notification.
Signed-off-by: Jon Mason <jdmason@us.ibm.com>
--- r8169.c 2004-11-02 10:37:31.035203120 -0600
+++ r8169.c.latest 2004-11-02 10:44:01.367863536 -0600
@@ -519,8 +519,10 @@ static void rtl8169_check_link_status(st
if (tp->link_ok(ioaddr)) {
netif_carrier_on(dev);
printk(KERN_INFO PFX "%s: link up\n", dev->name);
- } else
+ } else {
netif_carrier_off(dev);
+ printk(KERN_INFO PFX "%s: link down\n", dev->name);
+ }
spin_unlock_irqrestore(&tp->lock, flags);
}
@@ -773,7 +775,7 @@ static void rtl8169_gset_tbi(struct net_
status = RTL_R32(TBICSR);
cmd->advertising = (status & TBINwEnable) ? ADVERTISED_Autoneg : 0;
- cmd->autoneg = !!(status & TBINwEnable);
+ cmd->autoneg = status & TBINwEnable;
cmd->speed = SPEED_1000;
cmd->duplex = DUPLEX_FULL; /* Always set */
@@ -1639,7 +1641,7 @@ static int rtl8169_alloc_rx_skb(struct p
if (!skb)
goto err_out;
- skb_reserve(skb, 2);
+ skb_reserve(skb, NET_IP_ALIGN);
*sk_buff = skb;
mapping = pci_map_single(pdev, skb->tail, rx_buf_sz,
@@ -2071,9 +2073,9 @@ static inline int rtl8169_try_rx_copy(st
if (pkt_size < rx_copybreak) {
struct sk_buff *skb;
- skb = dev_alloc_skb(pkt_size + 2);
+ skb = dev_alloc_skb(pkt_size + NET_IP_ALIGN);
if (skb) {
- skb_reserve(skb, 2);
+ skb_reserve(skb, NET_IP_ALIGN);
eth_copy_and_sum(skb, sk_buff[0]->tail, pkt_size, 0);
*sk_buff = skb;
rtl8169_return_to_asic(desc, rx_buf_sz);
[-- Attachment #2: r8169-cleanup-3.patch --]
[-- Type: text/x-diff, Size: 1381 bytes --]
--- r8169.c 2004-11-02 10:37:31.035203120 -0600
+++ r8169.c.latest 2004-11-02 10:44:01.367863536 -0600
@@ -519,8 +519,10 @@ static void rtl8169_check_link_status(st
if (tp->link_ok(ioaddr)) {
netif_carrier_on(dev);
printk(KERN_INFO PFX "%s: link up\n", dev->name);
- } else
+ } else {
netif_carrier_off(dev);
+ printk(KERN_INFO PFX "%s: link down\n", dev->name);
+ }
spin_unlock_irqrestore(&tp->lock, flags);
}
@@ -773,7 +775,7 @@ static void rtl8169_gset_tbi(struct net_
status = RTL_R32(TBICSR);
cmd->advertising = (status & TBINwEnable) ? ADVERTISED_Autoneg : 0;
- cmd->autoneg = !!(status & TBINwEnable);
+ cmd->autoneg = status & TBINwEnable;
cmd->speed = SPEED_1000;
cmd->duplex = DUPLEX_FULL; /* Always set */
@@ -1639,7 +1641,7 @@ static int rtl8169_alloc_rx_skb(struct p
if (!skb)
goto err_out;
- skb_reserve(skb, 2);
+ skb_reserve(skb, NET_IP_ALIGN);
*sk_buff = skb;
mapping = pci_map_single(pdev, skb->tail, rx_buf_sz,
@@ -2071,9 +2073,9 @@ static inline int rtl8169_try_rx_copy(st
if (pkt_size < rx_copybreak) {
struct sk_buff *skb;
- skb = dev_alloc_skb(pkt_size + 2);
+ skb = dev_alloc_skb(pkt_size + NET_IP_ALIGN);
if (skb) {
- skb_reserve(skb, 2);
+ skb_reserve(skb, NET_IP_ALIGN);
eth_copy_and_sum(skb, sk_buff[0]->tail, pkt_size, 0);
*sk_buff = skb;
rtl8169_return_to_asic(desc, rx_buf_sz);
next reply other threads:[~2004-11-02 18:03 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-11-02 18:03 Jon Mason [this message]
2004-11-02 19:27 ` [PATCH 3/3] r8169: clean up Francois Romieu
2004-11-02 19:47 ` Jon Mason
2004-11-02 19:55 ` Thomas Graf
2004-11-02 21:56 ` Francois Romieu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=200411021203.25100.jdmason@us.ibm.com \
--to=jdmason@us.ibm.com \
--cc=netdev@oss.sgi.com \
--cc=romieu@fr.zoreil.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).