diff --git a/[refs] b/[refs] index 24533f4c7c09..53f154315e03 100644 --- 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 index 83ce06080ceb..2128e4169c5b 100644 --- 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.