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
nexedi
linux
Commits
0c147c6e
Commit
0c147c6e
authored
Feb 18, 2003
by
Hideaki Yoshifuji
Committed by
David S. Miller
Feb 18, 2003
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[NET]: Convert dst->{input,output}() fully to dst_{input,output}().
parent
baa04f2c
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
13 additions
and
21 deletions
+13
-21
include/net/dn_route.h
include/net/dn_route.h
+1
-1
net/decnet/dn_nsp_out.c
net/decnet/dn_nsp_out.c
+1
-1
net/decnet/dn_route.c
net/decnet/dn_route.c
+1
-1
net/ipv4/igmp.c
net/ipv4/igmp.c
+1
-9
net/ipv4/ip_input.c
net/ipv4/ip_input.c
+1
-1
net/ipv4/ipmr.c
net/ipv4/ipmr.c
+2
-2
net/ipv6/exthdrs.c
net/ipv6/exthdrs.c
+2
-2
net/ipv6/ip6_input.c
net/ipv6/ip6_input.c
+2
-2
net/ipv6/ip6_output.c
net/ipv6/ip6_output.c
+2
-2
No files found.
include/net/dn_route.h
View file @
0c147c6e
...
@@ -122,7 +122,7 @@ static inline void dn_nsp_send(struct sk_buff *skb)
...
@@ -122,7 +122,7 @@ static inline void dn_nsp_send(struct sk_buff *skb)
if
((
dst
=
sk
->
dst_cache
)
&&
!
dst
->
obsolete
)
{
if
((
dst
=
sk
->
dst_cache
)
&&
!
dst
->
obsolete
)
{
try_again:
try_again:
skb
->
dst
=
dst_clone
(
dst
);
skb
->
dst
=
dst_clone
(
dst
);
dst
->
output
(
skb
);
dst
_
output
(
skb
);
return
;
return
;
}
}
...
...
net/decnet/dn_nsp_out.c
View file @
0c147c6e
...
@@ -593,7 +593,7 @@ static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg,
...
@@ -593,7 +593,7 @@ static __inline__ void dn_nsp_do_disc(struct sock *sk, unsigned char msgflg,
* associations.
* associations.
*/
*/
skb
->
dst
=
dst_clone
(
dst
);
skb
->
dst
=
dst_clone
(
dst
);
skb
->
dst
->
output
(
skb
);
dst_
output
(
skb
);
}
}
...
...
net/decnet/dn_route.c
View file @
0c147c6e
...
@@ -389,7 +389,7 @@ static int dn_route_rx_packet(struct sk_buff *skb)
...
@@ -389,7 +389,7 @@ static int dn_route_rx_packet(struct sk_buff *skb)
int
err
;
int
err
;
if
((
err
=
dn_route_input
(
skb
))
==
0
)
if
((
err
=
dn_route_input
(
skb
))
==
0
)
return
skb
->
dst
->
input
(
skb
);
return
dst_
input
(
skb
);
if
(
decnet_debug_level
&
4
)
{
if
(
decnet_debug_level
&
4
)
{
char
*
devname
=
skb
->
dev
?
skb
->
dev
->
name
:
"???"
;
char
*
devname
=
skb
->
dev
?
skb
->
dev
->
name
:
"???"
;
...
...
net/ipv4/igmp.c
View file @
0c147c6e
...
@@ -184,14 +184,6 @@ static void igmp_mod_timer(struct ip_mc_list *im, int max_delay)
...
@@ -184,14 +184,6 @@ static void igmp_mod_timer(struct ip_mc_list *im, int max_delay)
#define IGMP_SIZE (sizeof(struct igmphdr)+sizeof(struct iphdr)+4)
#define IGMP_SIZE (sizeof(struct igmphdr)+sizeof(struct iphdr)+4)
/* Don't just hand NF_HOOK skb->dst->output, in case netfilter hook
changes route */
static
inline
int
output_maybe_reroute
(
struct
sk_buff
*
skb
)
{
return
skb
->
dst
->
output
(
skb
);
}
static
int
igmp_send_report
(
struct
net_device
*
dev
,
u32
group
,
int
type
)
static
int
igmp_send_report
(
struct
net_device
*
dev
,
u32
group
,
int
type
)
{
{
struct
sk_buff
*
skb
;
struct
sk_buff
*
skb
;
...
@@ -255,7 +247,7 @@ static int igmp_send_report(struct net_device *dev, u32 group, int type)
...
@@ -255,7 +247,7 @@ static int igmp_send_report(struct net_device *dev, u32 group, int type)
ih
->
csum
=
ip_compute_csum
((
void
*
)
ih
,
sizeof
(
struct
igmphdr
));
ih
->
csum
=
ip_compute_csum
((
void
*
)
ih
,
sizeof
(
struct
igmphdr
));
return
NF_HOOK
(
PF_INET
,
NF_IP_LOCAL_OUT
,
skb
,
NULL
,
rt
->
u
.
dst
.
dev
,
return
NF_HOOK
(
PF_INET
,
NF_IP_LOCAL_OUT
,
skb
,
NULL
,
rt
->
u
.
dst
.
dev
,
output_maybe_reroute
);
dst_output
);
}
}
...
...
net/ipv4/ip_input.c
View file @
0c147c6e
...
@@ -344,7 +344,7 @@ static inline int ip_rcv_finish(struct sk_buff *skb)
...
@@ -344,7 +344,7 @@ static inline int ip_rcv_finish(struct sk_buff *skb)
}
}
}
}
return
skb
->
dst
->
input
(
skb
);
return
dst_
input
(
skb
);
inhdr_error:
inhdr_error:
IP_INC_STATS_BH
(
IpInHdrErrors
);
IP_INC_STATS_BH
(
IpInHdrErrors
);
...
...
net/ipv4/ipmr.c
View file @
0c147c6e
...
@@ -1112,9 +1112,9 @@ static inline int ipmr_forward_finish(struct sk_buff *skb)
...
@@ -1112,9 +1112,9 @@ static inline int ipmr_forward_finish(struct sk_buff *skb)
struct
dst_entry
*
dst
=
skb
->
dst
;
struct
dst_entry
*
dst
=
skb
->
dst
;
if
(
skb
->
len
<=
dst_pmtu
(
dst
))
if
(
skb
->
len
<=
dst_pmtu
(
dst
))
return
dst
->
output
(
skb
);
return
dst
_
output
(
skb
);
else
else
return
ip_fragment
(
skb
,
dst
->
output
);
return
ip_fragment
(
skb
,
dst
_
output
);
}
}
/*
/*
...
...
net/ipv6/exthdrs.c
View file @
0c147c6e
...
@@ -288,7 +288,7 @@ static int ipv6_routing_header(struct sk_buff **skb_ptr, int nhoff)
...
@@ -288,7 +288,7 @@ static int ipv6_routing_header(struct sk_buff **skb_ptr, int nhoff)
dst_release
(
xchg
(
&
skb
->
dst
,
NULL
));
dst_release
(
xchg
(
&
skb
->
dst
,
NULL
));
ip6_route_input
(
skb
);
ip6_route_input
(
skb
);
if
(
skb
->
dst
->
error
)
{
if
(
skb
->
dst
->
error
)
{
skb
->
dst
->
input
(
skb
);
dst_
input
(
skb
);
return
-
1
;
return
-
1
;
}
}
if
(
skb
->
dst
->
dev
->
flags
&
IFF_LOOPBACK
)
{
if
(
skb
->
dst
->
dev
->
flags
&
IFF_LOOPBACK
)
{
...
@@ -302,7 +302,7 @@ static int ipv6_routing_header(struct sk_buff **skb_ptr, int nhoff)
...
@@ -302,7 +302,7 @@ static int ipv6_routing_header(struct sk_buff **skb_ptr, int nhoff)
goto
looped_back
;
goto
looped_back
;
}
}
skb
->
dst
->
input
(
skb
);
dst_
input
(
skb
);
return
-
1
;
return
-
1
;
}
}
...
...
net/ipv6/ip6_input.c
View file @
0c147c6e
...
@@ -47,7 +47,7 @@ static inline int ip6_rcv_finish( struct sk_buff *skb)
...
@@ -47,7 +47,7 @@ static inline int ip6_rcv_finish( struct sk_buff *skb)
if
(
skb
->
dst
==
NULL
)
if
(
skb
->
dst
==
NULL
)
ip6_route_input
(
skb
);
ip6_route_input
(
skb
);
return
skb
->
dst
->
input
(
skb
);
return
dst_
input
(
skb
);
}
}
int
ipv6_rcv
(
struct
sk_buff
*
skb
,
struct
net_device
*
dev
,
struct
packet_type
*
pt
)
int
ipv6_rcv
(
struct
sk_buff
*
skb
,
struct
net_device
*
dev
,
struct
packet_type
*
pt
)
...
@@ -235,7 +235,7 @@ int ip6_mc_input(struct sk_buff *skb)
...
@@ -235,7 +235,7 @@ int ip6_mc_input(struct sk_buff *skb)
skb2 = skb;
skb2 = skb;
}
}
dst
->
output(skb2);
dst
_
output(skb2);
}
}
}
}
#endif
#endif
...
...
net/ipv6/ip6_output.c
View file @
0c147c6e
...
@@ -174,7 +174,7 @@ static inline int ip6_maybe_reroute(struct sk_buff *skb)
...
@@ -174,7 +174,7 @@ static inline int ip6_maybe_reroute(struct sk_buff *skb)
}
}
}
}
#endif
/* CONFIG_NETFILTER */
#endif
/* CONFIG_NETFILTER */
return
skb
->
dst
->
output
(
skb
);
return
dst_
output
(
skb
);
}
}
/*
/*
...
@@ -722,7 +722,7 @@ int ip6_call_ra_chain(struct sk_buff *skb, int sel)
...
@@ -722,7 +722,7 @@ int ip6_call_ra_chain(struct sk_buff *skb, int sel)
static
inline
int
ip6_forward_finish
(
struct
sk_buff
*
skb
)
static
inline
int
ip6_forward_finish
(
struct
sk_buff
*
skb
)
{
{
return
skb
->
dst
->
output
(
skb
);
return
dst_
output
(
skb
);
}
}
int
ip6_forward
(
struct
sk_buff
*
skb
)
int
ip6_forward
(
struct
sk_buff
*
skb
)
...
...
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