git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
isdn
/
i4l
/
isdn_x25iface.c
diff --git
a/drivers/isdn/i4l/isdn_x25iface.c
b/drivers/isdn/i4l/isdn_x25iface.c
index
4ab7600
..
da1d2fb
100644
(file)
--- a/
drivers/isdn/i4l/isdn_x25iface.c
+++ b/
drivers/isdn/i4l/isdn_x25iface.c
@@
-21,7
+21,6
@@
#include <linux/netdevice.h>
#include <linux/concap.h>
#include <linux/wanrouter.h>
#include <linux/netdevice.h>
#include <linux/concap.h>
#include <linux/wanrouter.h>
-#include <net/x25device.h>
#include "isdn_x25iface.h"
/* for debugging messages not to cause an oops when device pointer is NULL*/
#include "isdn_x25iface.h"
/* for debugging messages not to cause an oops when device pointer is NULL*/
@@
-192,9
+191,12
@@
int isdn_x25iface_receive(struct concap_proto *cprot, struct sk_buff *skb)
IX25DEBUG( "isdn_x25iface_receive %s \n", MY_DEVNAME(cprot->net_dev) );
if ( ( (ix25_pdata_t*) (cprot->proto_data) )
-> state == WAN_CONNECTED ){
IX25DEBUG( "isdn_x25iface_receive %s \n", MY_DEVNAME(cprot->net_dev) );
if ( ( (ix25_pdata_t*) (cprot->proto_data) )
-> state == WAN_CONNECTED ){
+ skb -> dev = cprot -> net_dev;
+ skb -> protocol = htons(ETH_P_X25);
+ skb -> pkt_type = PACKET_HOST;
if( skb_push(skb, 1)){
skb -> data[0]=0x00;
if( skb_push(skb, 1)){
skb -> data[0]=0x00;
- skb
->protocol = x25_type_trans(skb, cprot->net_dev)
;
+ skb
-> mac.raw = skb -> data
;
netif_rx(skb);
return 0;
}
netif_rx(skb);
return 0;
}
@@
-222,7
+224,10
@@
int isdn_x25iface_connect_ind(struct concap_proto *cprot)
*state_p = WAN_CONNECTED;
if( skb ){
*( skb_put(skb, 1) ) = 0x01;
*state_p = WAN_CONNECTED;
if( skb ){
*( skb_put(skb, 1) ) = 0x01;
- skb->protocol = x25_type_trans(skb, cprot->net_dev);
+ skb -> mac.raw = skb -> data;
+ skb -> dev = cprot -> net_dev;
+ skb -> protocol = htons(ETH_P_X25);
+ skb -> pkt_type = PACKET_HOST;
netif_rx(skb);
return 0;
} else {
netif_rx(skb);
return 0;
} else {
@@
-251,7
+256,10
@@
int isdn_x25iface_disconn_ind(struct concap_proto *cprot)
skb = dev_alloc_skb(1);
if( skb ){
*( skb_put(skb, 1) ) = 0x02;
skb = dev_alloc_skb(1);
if( skb ){
*( skb_put(skb, 1) ) = 0x02;
- skb->protocol = x25_type_trans(skb, cprot->net_dev);
+ skb -> mac.raw = skb -> data;
+ skb -> dev = cprot -> net_dev;
+ skb -> protocol = htons(ETH_P_X25);
+ skb -> pkt_type = PACKET_HOST;
netif_rx(skb);
return 0;
} else {
netif_rx(skb);
return 0;
} else {