aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2006-09-20 12:08:03 -0700
committerDavid S. Miller <davem@sunset.davemloft.net>2006-09-22 15:20:08 -0700
commit955b944293dd4c931ec866ebe19a6b2463b8f9a0 (patch)
tree2b3053116a8585810977383c3d28c60c0f7d0fb5 /include/linux/netfilter_ipv4/ip_conntrack_pptp.h
parentedd5a329cf69c112882e03c8ab55e985062a5d2a (diff)
downloadkernel_samsung_smdk4412-955b944293dd4c931ec866ebe19a6b2463b8f9a0.zip
kernel_samsung_smdk4412-955b944293dd4c931ec866ebe19a6b2463b8f9a0.tar.gz
kernel_samsung_smdk4412-955b944293dd4c931ec866ebe19a6b2463b8f9a0.tar.bz2
[NETFILTER]: PPTP conntrack: get rid of unnecessary byte order conversions
The conntrack structure contains the call ID in host byte order for no reason, get rid of back and forth conversions. Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/netfilter_ipv4/ip_conntrack_pptp.h')
-rw-r--r--include/linux/netfilter_ipv4/ip_conntrack_pptp.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/netfilter_ipv4/ip_conntrack_pptp.h b/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
index 88f66d3..0d35623 100644
--- a/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
+++ b/include/linux/netfilter_ipv4/ip_conntrack_pptp.h
@@ -31,8 +31,8 @@ struct ip_ct_pptp_master {
/* everything below is going to be per-expectation in newnat,
* since there could be more than one call within one session */
enum pptp_ctrlcall_state cstate; /* call state */
- u_int16_t pac_call_id; /* call id of PAC, host byte order */
- u_int16_t pns_call_id; /* call id of PNS, host byte order */
+ __be16 pac_call_id; /* call id of PAC, host byte order */
+ __be16 pns_call_id; /* call id of PNS, host byte order */
/* in pre-2.6.11 this used to be per-expect. Now it is per-conntrack
* and therefore imposes a fixed limit on the number of maps */
@@ -42,8 +42,8 @@ struct ip_ct_pptp_master {
/* conntrack_expect private member */
struct ip_ct_pptp_expect {
enum pptp_ctrlcall_state cstate; /* call state */
- u_int16_t pac_call_id; /* call id of PAC */
- u_int16_t pns_call_id; /* call id of PNS */
+ __be16 pac_call_id; /* call id of PAC */
+ __be16 pns_call_id; /* call id of PNS */
};