diff --git a/[refs] b/[refs] index eff689945297..c09a891e8367 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9736749f581abd80c2831244e2659e2e833b0e3 +refs/heads/master: 985ebdb5ed54151eba734aa1b307460e8e4267ba diff --git a/trunk/include/linux/netdevice.h b/trunk/include/linux/netdevice.h index f24556813375..4647604c7ca9 100644 --- a/trunk/include/linux/netdevice.h +++ b/trunk/include/linux/netdevice.h @@ -467,7 +467,7 @@ struct netdev_queue { * This function is called when network device transistions to the down * state. * - * int (*ndo_hard_start_xmit)(struct sk_buff *skb, struct net_device *dev); + * int (*ndo_start_xmit)(struct sk_buff *skb, struct net_device *dev); * Called when a packet needs to be transmitted. * Must return NETDEV_TX_OK , NETDEV_TX_BUSY, or NETDEV_TX_LOCKED, * Required can not be NULL.