xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

neigh: Kill hh_cache->hh_output

Browse Source 
It's just taking on one of two possible values, either
neigh_ops->output or dev_queue_xmit().  And this is purely depending
upon whether nud_state has NUD_CONNECTED set or not.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
2011-07-16 17:45:02 -07:00
parent 47ec132a40
commit b23b5455b6
4 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
net/core/neighbour.c
View File

@@ -720,15 +720,9 @@ EXPORT_SYMBOL(neigh_destroy);
*/
static void neigh_suspect(struct neighbour *neigh)
{
struct hh_cache *hh;
NEIGH_PRINTK2("neigh %p is suspected.\n", neigh);
neigh->output = neigh->ops->output;
hh = &neigh->hh;
if (hh->hh_len)
hh->hh_output = neigh->ops->output;
}
/* Neighbour state is OK;
@@ -738,15 +732,9 @@ static void neigh_suspect(struct neighbour *neigh)
*/
static void neigh_connect(struct neighbour *neigh)
{
struct hh_cache *hh;
NEIGH_PRINTK2("neigh %p is connected.\n", neigh);
neigh->output = neigh->ops->connected_output;
hh = &neigh->hh;
if (hh->hh_len)
hh->hh_output = dev_queue_xmit;
}
static void neigh_periodic_work(struct work_struct *work)
@@ -1215,18 +1203,9 @@ static void neigh_hh_init(struct neighbour *n, struct dst_entry *dst)
/* Only one thread can come in here and initialize the
* hh_cache entry.
*/
if (hh->hh_len)
goto end;
if (!hh->hh_len)
dev->header_ops->cache(n, hh, prot);
if (dev->header_ops->cache(n, hh, prot))
goto end;
if (n->nud_state & NUD_CONNECTED)
hh->hh_output = dev_queue_xmit;
else
hh->hh_output = n->ops->output;
end:
write_unlock_bh(&n->lock);
}