Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
linux
Commits
cd098c4b
Commit
cd098c4b
authored
Oct 31, 2004
by
David S. Miller
Browse files
Options
Browse Files
Download
Plain Diff
Merge nuts.davemloft.net:/disk1/BK/network-2.6
into nuts.davemloft.net:/disk1/BK/net-2.6
parents
e47c11be
9b0516d2
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
73 additions
and
84 deletions
+73
-84
drivers/isdn/i4l/isdn_x25iface.c
drivers/isdn/i4l/isdn_x25iface.c
+4
-12
drivers/net/ethertap.c
drivers/net/ethertap.c
+1
-1
drivers/net/tg3.c
drivers/net/tg3.c
+19
-3
drivers/net/wan/cycx_x25.c
drivers/net/wan/cycx_x25.c
+3
-5
drivers/net/wan/dscc4.c
drivers/net/wan/dscc4.c
+0
-1
drivers/net/wan/hdlc_x25.c
drivers/net/wan/hdlc_x25.c
+4
-10
drivers/net/wan/lapbether.c
drivers/net/wan/lapbether.c
+5
-15
drivers/net/wan/x25_asy.c
drivers/net/wan/x25_asy.c
+5
-13
include/net/ip_vs.h
include/net/ip_vs.h
+1
-1
include/net/x25device.h
include/net/x25device.h
+17
-0
net/8021q/vlan_dev.c
net/8021q/vlan_dev.c
+5
-18
net/ipv4/netfilter/ip_conntrack_core.c
net/ipv4/netfilter/ip_conntrack_core.c
+1
-1
net/x25/af_x25.c
net/x25/af_x25.c
+1
-0
net/x25/x25_dev.c
net/x25/x25_dev.c
+3
-1
net/x25/x25_proc.c
net/x25/x25_proc.c
+4
-3
No files found.
drivers/isdn/i4l/isdn_x25iface.c
View file @
cd098c4b
...
...
@@ -21,6 +21,7 @@
#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*/
...
...
@@ -191,12 +192,9 @@ 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
){
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
;
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
protocol
=
x25_type_trans
(
skb
,
cprot
->
net_dev
)
;
netif_rx
(
skb
);
return
0
;
}
...
...
@@ -224,10 +222,7 @@ int isdn_x25iface_connect_ind(struct concap_proto *cprot)
*
state_p
=
WAN_CONNECTED
;
if
(
skb
){
*
(
skb_put
(
skb
,
1
)
)
=
0x01
;
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
dev
=
cprot
->
net_dev
;
skb
->
protocol
=
htons
(
ETH_P_X25
);
skb
->
pkt_type
=
PACKET_HOST
;
skb
->
protocol
=
x25_type_trans
(
skb
,
cprot
->
net_dev
);
netif_rx
(
skb
);
return
0
;
}
else
{
...
...
@@ -256,10 +251,7 @@ int isdn_x25iface_disconn_ind(struct concap_proto *cprot)
skb
=
dev_alloc_skb
(
1
);
if
(
skb
){
*
(
skb_put
(
skb
,
1
)
)
=
0x02
;
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
dev
=
cprot
->
net_dev
;
skb
->
protocol
=
htons
(
ETH_P_X25
);
skb
->
pkt_type
=
PACKET_HOST
;
skb
->
protocol
=
x25_type_trans
(
skb
,
cprot
->
net_dev
);
netif_rx
(
skb
);
return
0
;
}
else
{
...
...
drivers/net/ethertap.c
View file @
cd098c4b
...
...
@@ -124,7 +124,7 @@ static int ethertap_open(struct net_device *dev)
struct
net_local
*
lp
=
netdev_priv
(
dev
);
if
(
ethertap_debug
>
2
)
printk
(
KERN_DEBUG
"%s: Doing ethertap_open()..."
,
dev
->
name
);
printk
(
KERN_DEBUG
"%s: Doing ethertap_open()...
\n
"
,
dev
->
name
);
lp
->
nl
=
netlink_kernel_create
(
dev
->
base_addr
,
ethertap_rx
);
if
(
lp
->
nl
==
NULL
)
...
...
drivers/net/tg3.c
View file @
cd098c4b
...
...
@@ -60,8 +60,8 @@
#define DRV_MODULE_NAME "tg3"
#define PFX DRV_MODULE_NAME ": "
#define DRV_MODULE_VERSION "3.1
1
"
#define DRV_MODULE_RELDATE "October 2
0
, 2004"
#define DRV_MODULE_VERSION "3.1
2
"
#define DRV_MODULE_RELDATE "October 2
8
, 2004"
#define TG3_DEF_MAC_MODE 0
#define TG3_DEF_RX_MODE 0
...
...
@@ -418,6 +418,20 @@ static void tg3_enable_ints(struct tg3 *tp)
tg3_cond_int
(
tp
);
}
/* tg3_restart_ints
* similar to tg3_enable_ints, but it can return without flushing the
* PIO write which reenables interrupts
*/
static
void
tg3_restart_ints
(
struct
tg3
*
tp
)
{
tw32
(
TG3PCI_MISC_HOST_CTRL
,
(
tp
->
misc_host_ctrl
&
~
MISC_HOST_CTRL_MASK_PCI_INT
));
tw32_mailbox
(
MAILBOX_INTERRUPT_0
+
TG3_64BIT_REG_LOW
,
0x00000000
);
mmiowb
();
tg3_cond_int
(
tp
);
}
static
inline
void
tg3_netif_stop
(
struct
tg3
*
tp
)
{
netif_poll_disable
(
tp
->
dev
);
...
...
@@ -2730,6 +2744,7 @@ static int tg3_rx(struct tg3 *tp, int budget)
tw32_rx_mbox
(
MAILBOX_RCV_JUMBO_PROD_IDX
+
TG3_64BIT_REG_LOW
,
sw_idx
);
}
mmiowb
();
return
received
;
}
...
...
@@ -2788,7 +2803,7 @@ static int tg3_poll(struct net_device *netdev, int *budget)
if
(
done
)
{
spin_lock_irqsave
(
&
tp
->
lock
,
flags
);
__netif_rx_complete
(
netdev
);
tg3_
enable
_ints
(
tp
);
tg3_
restart
_ints
(
tp
);
spin_unlock_irqrestore
(
&
tp
->
lock
,
flags
);
}
...
...
@@ -3177,6 +3192,7 @@ static int tg3_start_xmit(struct sk_buff *skb, struct net_device *dev)
netif_stop_queue
(
dev
);
out_unlock:
mmiowb
();
spin_unlock_irqrestore
(
&
tp
->
tx_lock
,
flags
);
dev
->
trans_start
=
jiffies
;
...
...
drivers/net/wan/cycx_x25.c
View file @
cd098c4b
...
...
@@ -92,6 +92,8 @@
#include <linux/cyclomx.h>
/* Cyclom 2X common user API definitions */
#include <linux/cycx_x25.h>
/* X.25 firmware API definitions */
#include <net/x25device.h>
/* Defines & Macros */
#define CYCX_X25_MAX_CMD_RETRY 5
#define CYCX_X25_CHAN_MTU 2048
/* unfragmented logical channel MTU */
...
...
@@ -1486,11 +1488,7 @@ static void cycx_x25_chan_send_event(struct net_device *dev, u8 event)
ptr
=
skb_put
(
skb
,
1
);
*
ptr
=
event
;
skb
->
dev
=
dev
;
skb
->
protocol
=
htons
(
ETH_P_X25
);
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
pkt_type
=
PACKET_HOST
;
skb
->
protocol
=
x25_type_trans
(
skb
,
dev
);
netif_rx
(
skb
);
dev
->
last_rx
=
jiffies
;
/* timestamp */
}
...
...
drivers/net/wan/dscc4.c
View file @
cd098c4b
...
...
@@ -519,7 +519,6 @@ inline int try_get_rx_skb(struct dscc4_dev_priv *dpriv, struct net_device *dev)
dpriv
->
rx_skbuff
[
dirty
]
=
skb
;
if
(
skb
)
{
skb
->
protocol
=
hdlc_type_trans
(
skb
,
dev
);
skb
->
mac
.
raw
=
skb
->
data
;
rx_fd
->
data
=
pci_map_single
(
dpriv
->
pci_priv
->
pdev
,
skb
->
data
,
len
,
PCI_DMA_FROMDEVICE
);
}
else
{
...
...
drivers/net/wan/hdlc_x25.c
View file @
cd098c4b
...
...
@@ -23,6 +23,8 @@
#include <linux/rtnetlink.h>
#include <linux/hdlc.h>
#include <net/x25device.h>
/* These functions are callbacks called by LAPB layer */
static
void
x25_connect_disconnect
(
struct
net_device
*
dev
,
int
reason
,
int
code
)
...
...
@@ -38,11 +40,7 @@ static void x25_connect_disconnect(struct net_device *dev, int reason, int code)
ptr
=
skb_put
(
skb
,
1
);
*
ptr
=
code
;
skb
->
dev
=
dev
;
skb
->
protocol
=
htons
(
ETH_P_X25
);
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
pkt_type
=
PACKET_HOST
;
skb
->
protocol
=
x25_type_trans
(
skb
,
dev
);
netif_rx
(
skb
);
}
...
...
@@ -74,11 +72,7 @@ static int x25_data_indication(struct net_device *dev, struct sk_buff *skb)
ptr
=
skb
->
data
;
*
ptr
=
0
;
skb
->
dev
=
dev
;
skb
->
protocol
=
htons
(
ETH_P_X25
);
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
pkt_type
=
PACKET_HOST
;
skb
->
protocol
=
x25_type_trans
(
skb
,
dev
);
return
netif_rx
(
skb
);
}
...
...
drivers/net/wan/lapbether.c
View file @
cd098c4b
...
...
@@ -43,6 +43,8 @@
#include <linux/lapb.h>
#include <linux/init.h>
#include <net/x25device.h>
static
char
bcast_addr
[
6
]
=
{
0xFF
,
0xFF
,
0xFF
,
0xFF
,
0xFF
,
0xFF
};
/* If this number is made larger, check that the temporary string buffer
...
...
@@ -137,11 +139,7 @@ static int lapbeth_data_indication(struct net_device *dev, struct sk_buff *skb)
ptr
=
skb
->
data
;
*
ptr
=
0x00
;
skb
->
dev
=
dev
;
skb
->
protocol
=
htons
(
ETH_P_X25
);
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
pkt_type
=
PACKET_HOST
;
skb
->
protocol
=
x25_type_trans
(
skb
,
dev
);
skb
->
dev
->
last_rx
=
jiffies
;
return
netif_rx
(
skb
);
}
...
...
@@ -233,11 +231,7 @@ static void lapbeth_connected(struct net_device *dev, int reason)
ptr
=
skb_put
(
skb
,
1
);
*
ptr
=
0x01
;
skb
->
dev
=
dev
;
skb
->
protocol
=
htons
(
ETH_P_X25
);
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
pkt_type
=
PACKET_HOST
;
skb
->
protocol
=
x25_type_trans
(
skb
,
dev
);
skb
->
dev
->
last_rx
=
jiffies
;
netif_rx
(
skb
);
}
...
...
@@ -255,11 +249,7 @@ static void lapbeth_disconnected(struct net_device *dev, int reason)
ptr
=
skb_put
(
skb
,
1
);
*
ptr
=
0x02
;
skb
->
dev
=
dev
;
skb
->
protocol
=
htons
(
ETH_P_X25
);
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
pkt_type
=
PACKET_HOST
;
skb
->
protocol
=
x25_type_trans
(
skb
,
dev
);
skb
->
dev
->
last_rx
=
jiffies
;
netif_rx
(
skb
);
}
...
...
drivers/net/wan/x25_asy.c
View file @
cd098c4b
...
...
@@ -34,6 +34,8 @@
#include <linux/init.h>
#include "x25_asy.h"
#include <net/x25device.h>
static
struct
net_device
**
x25_asy_devs
;
static
int
x25_asy_maxdev
=
SL_NRUNIT
;
...
...
@@ -209,10 +211,8 @@ static void x25_asy_bump(struct x25_asy *sl)
return
;
}
skb_push
(
skb
,
1
);
/* LAPB internal control */
skb
->
dev
=
sl
->
dev
;
memcpy
(
skb_put
(
skb
,
count
),
sl
->
rbuff
,
count
);
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
protocol
=
htons
(
ETH_P_X25
);
skb
->
protocol
=
x25_type_trans
(
skb
,
sl
->
dev
);
if
((
err
=
lapb_data_received
(
skb
->
dev
,
skb
))
!=
LAPB_OK
)
{
kfree_skb
(
skb
);
...
...
@@ -419,11 +419,7 @@ static void x25_asy_connected(struct net_device *dev, int reason)
ptr
=
skb_put
(
skb
,
1
);
*
ptr
=
0x01
;
skb
->
dev
=
sl
->
dev
;
skb
->
protocol
=
htons
(
ETH_P_X25
);
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
pkt_type
=
PACKET_HOST
;
skb
->
protocol
=
x25_type_trans
(
skb
,
sl
->
dev
);
netif_rx
(
skb
);
sl
->
dev
->
last_rx
=
jiffies
;
}
...
...
@@ -442,11 +438,7 @@ static void x25_asy_disconnected(struct net_device *dev, int reason)
ptr
=
skb_put
(
skb
,
1
);
*
ptr
=
0x02
;
skb
->
dev
=
sl
->
dev
;
skb
->
protocol
=
htons
(
ETH_P_X25
);
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
pkt_type
=
PACKET_HOST
;
skb
->
protocol
=
x25_type_trans
(
skb
,
sl
->
dev
);
netif_rx
(
skb
);
sl
->
dev
->
last_rx
=
jiffies
;
}
...
...
include/net/ip_vs.h
View file @
cd098c4b
...
...
@@ -8,7 +8,7 @@
#include <asm/types.h>
/* For __uXX types */
#define IP_VS_VERSION_CODE 0x01020
0
#define IP_VS_VERSION_CODE 0x01020
1
#define NVERSION(version) \
(version >> 16) & 0xFF, \
(version >> 8) & 0xFF, \
...
...
include/net/x25device.h
0 → 100644
View file @
cd098c4b
#ifndef _X25DEVICE_H
#define _X25DEVICE_H
#include <linux/if_ether.h>
#include <linux/if_packet.h>
#include <linux/skbuff.h>
static
inline
unsigned
short
x25_type_trans
(
struct
sk_buff
*
skb
,
struct
net_device
*
dev
)
{
skb
->
mac
.
raw
=
skb
->
data
;
skb
->
input_dev
=
skb
->
dev
=
dev
;
skb
->
pkt_type
=
PACKET_HOST
;
return
htons
(
ETH_P_X25
);
}
#endif
net/8021q/vlan_dev.c
View file @
cd098c4b
...
...
@@ -484,26 +484,13 @@ int vlan_dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
veth
->
h_vlan_proto
,
veth
->
h_vlan_TCI
,
veth
->
h_vlan_encapsulated_proto
);
#endif
skb
->
dev
=
VLAN_DEV_INFO
(
dev
)
->
real_dev
;
{
/* Please note, dev_queue_xmit consumes the pkt regardless of the
* error value. So, will copy the skb first and free if successful.
*/
struct
sk_buff
*
skb2
=
skb_get
(
skb
);
int
rv
=
dev_queue_xmit
(
skb2
);
if
(
rv
==
0
)
{
/* Was success, need to free the skb reference since we bumped up the
* user count above.
*/
stats
->
tx_packets
++
;
/* for statics only */
stats
->
tx_bytes
+=
skb
->
len
;
stats
->
tx_packets
++
;
/* for statics only */
stats
->
tx_bytes
+=
skb
->
len
;
skb
->
dev
=
VLAN_DEV_INFO
(
dev
)
->
real_dev
;
dev_queue_xmit
(
skb
)
;
kfree_skb
(
skb
);
}
return
rv
;
}
return
0
;
}
int
vlan_dev_hwaccel_hard_start_xmit
(
struct
sk_buff
*
skb
,
struct
net_device
*
dev
)
...
...
net/ipv4/netfilter/ip_conntrack_core.c
View file @
cd098c4b
...
...
@@ -312,6 +312,7 @@ destroy_conntrack(struct nf_conntrack *nfct)
}
kmem_cache_free
(
ip_conntrack_expect_cachep
,
ct
->
master
);
}
CONNTRACK_STAT_INC
(
delete
);
WRITE_UNLOCK
(
&
ip_conntrack_lock
);
if
(
master
)
...
...
@@ -320,7 +321,6 @@ destroy_conntrack(struct nf_conntrack *nfct)
DEBUGP
(
"destroy_conntrack: returning ct=%p to slab
\n
"
,
ct
);
kmem_cache_free
(
ip_conntrack_cachep
,
ct
);
atomic_dec
(
&
ip_conntrack_count
);
CONNTRACK_STAT_INC
(
delete
);
}
static
void
death_by_timeout
(
unsigned
long
ul_conntrack
)
...
...
net/x25/af_x25.c
View file @
cd098c4b
...
...
@@ -347,6 +347,7 @@ void x25_destroy_socket(struct sock *sk)
/* Defer: outstanding buffers */
sk
->
sk_timer
.
expires
=
jiffies
+
10
*
HZ
;
sk
->
sk_timer
.
function
=
x25_destroy_timer
;
sk
->
sk_timer
.
data
=
(
unsigned
long
)
sk
;
add_timer
(
&
sk
->
sk_timer
);
}
else
{
/* drop last reference so sock_put will free */
...
...
net/x25/x25_dev.c
View file @
cd098c4b
...
...
@@ -92,7 +92,9 @@ static int x25_receive_data(struct sk_buff *skb, struct x25_neigh *nb)
/*
x25_transmit_clear_request(nb, lci, 0x0D);
*/
printk
(
KERN_DEBUG
"x25_receive_data(): unknown frame type %2x
\n
"
,
frametype
);
if
(
frametype
!=
X25_CLEAR_CONFIRMATION
)
printk
(
KERN_DEBUG
"x25_receive_data(): unknown frame type %2x
\n
"
,
frametype
);
return
0
;
}
...
...
net/x25/x25_proc.c
View file @
cd098c4b
...
...
@@ -32,10 +32,11 @@ static __inline__ struct x25_route *x25_get_route_idx(loff_t pos)
list_for_each
(
route_entry
,
&
x25_route_list
)
{
rt
=
list_entry
(
route_entry
,
struct
x25_route
,
node
);
if
(
--
pos
)
break
;
if
(
!
pos
--
)
goto
found
;
}
rt
=
NULL
;
found:
return
rt
;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment