diff options
| author | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
|---|---|---|
| committer | Christoph Lameter <clameter@sgi.com> | 2008-02-14 15:05:41 -0500 |
| commit | c5974932c1e8514d3478573bb52beebeb2c786dd (patch) | |
| tree | a204156fbb0036fb76e89ceffa15a30e90bc3f75 /net/core/dev.c | |
| parent | 9e40ade04c45a46f6b3d647e0bdac1a32bfaa3a9 (diff) | |
| parent | e760e716d47b48caf98da348368fd41b4a9b9e7e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'net/core/dev.c')
| -rw-r--r-- | net/core/dev.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/core/dev.c b/net/core/dev.c index 9549417250bb..b3e19ae57f95 100644 --- a/net/core/dev.c +++ b/net/core/dev.c | |||
| @@ -2143,7 +2143,7 @@ static int process_backlog(struct napi_struct *napi, int quota) | |||
| 2143 | * | 2143 | * |
| 2144 | * The entry's receive function will be scheduled to run | 2144 | * The entry's receive function will be scheduled to run |
| 2145 | */ | 2145 | */ |
| 2146 | void fastcall __napi_schedule(struct napi_struct *n) | 2146 | void __napi_schedule(struct napi_struct *n) |
| 2147 | { | 2147 | { |
| 2148 | unsigned long flags; | 2148 | unsigned long flags; |
| 2149 | 2149 | ||
| @@ -3038,8 +3038,7 @@ int dev_unicast_sync(struct net_device *to, struct net_device *from) | |||
| 3038 | EXPORT_SYMBOL(dev_unicast_sync); | 3038 | EXPORT_SYMBOL(dev_unicast_sync); |
| 3039 | 3039 | ||
| 3040 | /** | 3040 | /** |
| 3041 | * dev_unicast_unsync - Remove synchronized addresses from the destination | 3041 | * dev_unicast_unsync - Remove synchronized addresses from the destination device |
| 3042 | * device | ||
| 3043 | * @to: destination device | 3042 | * @to: destination device |
| 3044 | * @from: source device | 3043 | * @from: source device |
| 3045 | * | 3044 | * |