diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 15:55:09 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 15:55:09 -0700 |
| commit | 61b22e693ea33af02f3380d3dbed9ee65a80c729 (patch) | |
| tree | 4507ddcc055109e35a03820115abd7c09a5d0cdd /drivers/net/hamradio/6pack.c | |
| parent | 3a3bca5ace9123d1a6b890ceac2902ebf2b1fd50 (diff) | |
| parent | 24b8e05dc1b03c1f80828e642838511c16e17250 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/hamradio/6pack.c')
| -rw-r--r-- | drivers/net/hamradio/6pack.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/hamradio/6pack.c b/drivers/net/hamradio/6pack.c index 0b230222bfe..90999867a32 100644 --- a/drivers/net/hamradio/6pack.c +++ b/drivers/net/hamradio/6pack.c @@ -293,7 +293,7 @@ static int sp_header(struct sk_buff *skb, struct net_device *dev, { #ifdef CONFIG_INET if (type != htons(ETH_P_AX25)) - return ax25_encapsulate(skb, dev, type, daddr, saddr, len); + return ax25_hard_header(skb, dev, type, daddr, saddr, len); #endif return 0; } |