---

yaml --- r: 298784 b: refs/heads/master c: de7aca1 h: refs/heads/master v: v3
git-mirror · Apr 6, 2012 · 2139b59 · 2139b59
1 parent 4304780
commit 2139b59
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b3cf65457fc0c8d183bdb9bc4358e5706aa63cc5
+refs/heads/master: de7aca16fd6c32719b6a7d4480b8f4685f69f7ff
diff --git a/trunk/Documentation/networking/driver.txt b/trunk/Documentation/networking/driver.txt
@@ -58,13 +58,10 @@ Transmit path guidelines:
             TX_BUFFS_AVAIL(dp) > 0)
 		netif_wake_queue(dp->dev);
 
-2) Do not forget to update netdev->trans_start to jiffies after
-   each new tx packet is given to the hardware.
-
-3) An ndo_start_xmit method must not modify the shared parts of a
+2) An ndo_start_xmit method must not modify the shared parts of a
    cloned SKB.
 
-4) Do not forget that once you return 0 from your ndo_start_xmit
+3) Do not forget that once you return 0 from your ndo_start_xmit
    method, it is your driver's responsibility to free up the SKB
    and in some finite amount of time.