diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-10-13 12:12:33 -0700 |
| commit | d3e384e4f00aa90db4310f82f3cbe6528e256334 (patch) | |
| tree | 716c9dfa64dd9fdc4b05b377a2a19b7b216c4856 /lib/sockopt.h | |
| parent | d0cee3d3d7267f8f5c1d1ffd5c5fd8802a9db987 (diff) | |
| parent | 41dc3488cf127a1e23333459a0c316ded67f7ff3 (diff) | |
| download | quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.bz2 quagga-d3e384e4f00aa90db4310f82f3cbe6528e256334.tar.xz | |
Merge branch 'master' of /home/shemminger/src/quagga into upstream
Resolve all conflicts by using upstream version.
Diffstat (limited to 'lib/sockopt.h')
| -rw-r--r-- | lib/sockopt.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/sockopt.h b/lib/sockopt.h index 95382792..db2f94f0 100644 --- a/lib/sockopt.h +++ b/lib/sockopt.h @@ -89,6 +89,10 @@ extern int setsockopt_multicast_ipv4(int sock, int optname, unsigned int ifindex /* optional: if non-zero, may be used instead of if_addr */); +<<<<<<< HEAD:lib/sockopt.h +======= +extern int setsockopt_ipv4_tos(int sock, int tos); +>>>>>>> 41dc3488cf127a1e23333459a0c316ded67f7ff3:lib/sockopt.h /* Ask for, and get, ifindex, by whatever method is supported. */ extern int setsockopt_ifindex (int, int, int); |